From: Bjorn Munch
Date: September 29 2010 11:06am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2937) Bug#52828
List-Archive: http://lists.mysql.com/commits/119386
X-Bug: 52828
Message-Id: <201009291106.o8TB6WGr018517@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0757407732=="

--===============0757407732==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/perlpath-51/ based on revid:bjorn.munch@stripped

 2937 Bjorn Munch	2010-09-29
      Bug #52828 Tests that use perl fail when perl is not in path
      Trying to run perl fails, just like it does when perl is started but fails
      Trap the case that perl was not found/could not be started, and skip test
      Also force a restart of servers since test may already have done something

    modified:
      client/mysqltest.cc
      mysql-test/mysql-test-run.pl
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-29 10:56:10 +0000
+++ b/client/mysqltest.cc	2010-09-29 11:03:53 +0000
@@ -3853,7 +3853,18 @@ void do_perl(struct st_command *command)
     if (!error)
       my_delete(temp_file_path, MYF(0));
 
-    handle_command_error(command, WEXITSTATUS(error));
+    /* Check for error code that indicates perl could not be started */
+    int exstat= WEXITSTATUS(error);
+#ifdef __WIN__
+    if (exstat == 1)
+      /* Text must begin 'perl not found' as mtr looks for it */
+      abort_not_supported_test("perl not found in path or did not start");
+#else
+    if (exstat == 127)
+      abort_not_supported_test("perl not found in path");
+#endif
+    else
+      handle_command_error(command, exstat);
   }
   dynstr_free(&ds_delimiter);
   DBUG_VOID_RETURN;

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-28 13:58:01 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-09-29 11:03:53 +0000
@@ -3583,6 +3583,9 @@ sub run_testcase ($) {
 	# Try to get reason from test log file
 	find_testcase_skipped_reason($tinfo);
 	mtr_report_test_skipped($tinfo);
+	# Restart if skipped due to missing perl, it may have had side effects
+	stop_all_servers($opt_shutdown_timeout)
+	  if ($tinfo->{'comment'} =~ /^perl not found/);
       }
       elsif ( $res == 65 )
       {


--===============0757407732==
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/perlpath-51/
# testament_sha1: 942ccecbc0bd90c8cd103b628e2b8e54c8de83dd
# timestamp: 2010-09-29 13:06:32 +0200
# base_revision_id: bjorn.munch@stripped\
#   e7w42ulr0elw680x
# 
# Begin bundle
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


--===============0757407732==--