From: Bjorn Munch Date: March 8 2011 9:48am Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3042) List-Archive: http://lists.mysql.com/commits/132580 Message-Id: <201103080948.p289mD9t021458@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0726823578==" --===============0726823578== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/system-tr/ based on revid:bjorn.munch@stripped 3042 Bjorn Munch 2011-03-08 Undo debug change to run_ctest in MTR modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2011-03-01 11:49:58 +0000 +++ b/mysql-test/mysql-test-run.pl 2011-03-08 09:48:07 +0000 @@ -5716,7 +5716,7 @@ sub run_ctest() { # Also silently ignore if we don't have ctest and didn't insist # Special override: also ignore in Pushbuild, some platforms may not have it # Now, run ctest and collect output - my $ctest_out= `ctest -V -R regex* $ctest_vs 2>&1`; + my $ctest_out= `ctest $ctest_vs 2>&1`; if ($? == $no_ctest && $opt_ctest == -1 && ! defined $ENV{PB2WORKDIR}) { chdir($olddir); return; --===============0726823578== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/system-tr/ # testament_sha1: 14138ab911e5789c2a4c1d9052c98fd826d942e4 # timestamp: 2011-03-08 10:48:13 +0100 # base_revision_id: bjorn.munch@stripped\ # 0ynkhd116bsx791h # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYru7Z0AAYTfgAAQVWP//1IC FgD////wUAN63q6suA71vecJJIBDAhiNTGmgJqZlDyah6mEkkDU2k09NEE9I0yAAB6gAJQpiGqfp NTxMmmk9RkDQABoAZJJ4k9CDQaaaADQyGQAAkkmQaT1NT1NN6o2oyaaZGmQAAyzEw9LLhb7UvrdE DTAZ8zTr+8Ka9+pRV9vJIOgKbODOY7RF/bN1l/U/aa6DyyjYjrot776rc1ScwpTU1z6jPAjlFrvw yOKY1vfeQjDBIsErWzTWzhcw2LtxBhGl7FTki0tzwUhMgiOQTVSezzJzWPr4WbFcLDbUIlqIS350 iNVCCtNVcPre+6+ivJeBpm+bHIrJ3MVDlfJ+5+q0eUA7wtyQcXKwygr8HzLUxJ5N+NgbI2Ymnmon aa8rRhDRZCOd2jXmT/1NKRNjF6UCSc5woY6HNlQ1R9yLRUf50lJFixNiiOM4TvKJaMoqsycQN9kC rN5TRiTZbXmLmIYy1wttSdLNHFuzIiRwEe+fRtHJr4vjRcYqUpKspNmwtNDT5xRQXuqupiQdYxTm cYscNVhPmWMyDDDQQiSdMOt7GwPwU9NavzzIsk6SuexBkWCuJwhOL+V+BvLY56plFw9ZdnUiD4qM zeNL0p/PL8pPChuuJyokeVY2ss2WvFRYb8fDmkPCn2lD4e9Ub08MiLVu31cSm8npgIC0NRrGd9TO wVmL0aDRtDAlIjmTx/IrkL2vrpeZI+Uirj68mY4U5ZBXrdKSzqFM5dMtMmjAi4R93j48MCwoe2Cd /48hfyks95hz2MMVGG3ld6sibpnuliaD6cURHhMpcr+u7vbZAJmIwrlyi1QKGg59S3B2erHJcTnT dNoY5Vt0fvRhnP2MCiBu6rJGz+0qpNdxN8dE2SGwxFaeMxOGT/V0vVBtDW7Y4wNh7aUjfkJqYa11 YBIJODFWkNFtvXfpirN4hyZi3A4X/AYtYqJEk3TSbcAhchIeKhIEUjVQISGBw7ymiFm5XF6IMmWr X23YAoFbGx5wSKQrUQWt5TbNGxUZ9LMnyHSpLIMknEXQcGftbasxKksMsCMm2Q/B6Sqdd3FFGmkq mW+ieLoczPaG0GqUuGTP3BWAtIMMNciyuXnUymmm3iuVlq3HTawxeK6m/XIhSEkirD2S/Q40tntn D53IhPVZyRJJghktD2EoSoasZQxKh5m8l60hXoMH8/0KmZGXEXckU4UJCK7u2dA= --===============0726823578==--