From: John David Duncan
Date: May 12 2011 4:04pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (john.duncan:4191)
List-Archive: http://lists.mysql.com/commits/137256
Message-Id: <201105121604.p4CG4mXq010685@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1024805480=="

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

#At file:///Users/jdd/bzr-repo/working/mysql-5.1-telco-7.1/ based on revid:jonas@stripped

 4191 John David Duncan	2011-05-12
      Smarter test for junit jar file.

    modified:
      mysql-test/suite/ndb/include/have_junit.inc
=== modified file 'mysql-test/suite/ndb/include/have_junit.inc'
--- a/mysql-test/suite/ndb/include/have_junit.inc	2010-02-03 10:11:55 +0000
+++ b/mysql-test/suite/ndb/include/have_junit.inc	2011-05-12 16:04:16 +0000
@@ -2,19 +2,35 @@
 use strict;
 use IO::File;
 
-#
-# Looks for JUnit JAR file in MTR_CLASSPATH
-#
-
+my $ok = 0;
 my $classpath = $ENV{'MTR_CLASSPATH'} || '';
-
 my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
+my $jar;
+my $notfound;
+
+# -- look for the junit jar file
+foreach $jar (split ':', $classpath) {
+  if($jar =~ m/junit/  && -f $jar) {
+    $ok = 2;
+  }
+  elsif($jar =~ m/junit/) {
+    $ok = 1;
+    $notfound = $jar;
+  }
+}
+
+# -- write the result to the output file
 my $F = IO::File->new("$vardir/tmp/have_junit_result.inc", "w") or die;
-if ($classpath =~ m/junit/) {
-  print $F "--echo Found JUnit JAR in MTR_CLASSPATH\n";
-} else {
-  print $F "--skip Could not find JUnit JAR file, please set MTR_CLASSPATH env variable\n";
+if($ok == 2) {
+  print $F  "--echo Found JUnit JAR in MTR_CLASSPATH\n";
+}
+elsif($ok == 1) {
+  print $F  "--skip JAR file not found: \"$notfound\"\n";
+} 
+else {
+  print $F  "--skip Please specify Junit JAR file in MTR_CLASSPATH env variable\n";
 }
+
 $F->close();
 
 EOF


--===============1024805480==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/john.duncan@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john.duncan@stripped
# target_branch: file:///Users/jdd/bzr-repo/working/mysql-5.1-telco-\
#   7.1/
# testament_sha1: 7c3e604c01d20e6d2bd0cf91923590c19a8c7f1f
# timestamp: 2011-05-12 09:04:40 -0700
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdiKeeAAAe5fgEAQXef//39W
XgS////7UAR+emgOgAAAaVGm0jQxNA0YjTamjIANAAND1ADVIxGR6eqeptTTQBoABhMTQAAAOMmT
JiMTACZMEyAGjCMAQwEVP01IyNPUAaaaMQMgZDQaaBpkDEBJICAJiABGp6Kn4CjR5RtQaR6aZMKO
X22tjw9Juj/XxNZth9ipgcUGw3aLYEGA130xv2ytoH21xayPB1TFacwpLtW9yT1gt37/t1fVSlb/
m848P30Mhh8JwgosqR0jooEAiYCFsxIi2sYhT7RTgsARYj+RJSeCHhq850+o3N9hU6dcZwHT8fub
YEHUJ7hnuGvfP6UdqIUGns4O0U9P9TW9a1GD0dRFH4jLybJnDzm/c1YMcezV/x5nK0JoWI4RYaCA
QvTAi2qq22w4RzDTECp4KSUtRmeFiMk5KxFrOshgd9kwGZtKc5OEmrG9vNPwI4aTEVCCqL1hQ9Op
UlXB5GEAGZqnVsaoqrhNBkduyjhQIhGepBAxaXHRL3ZGPxT/Ky7NIWhBZDSXaOm/xqJ3bX5GmnjF
Q15sziq5bdbAnf5armFQSm8pjqe+urLEha4rg8WUaArlIz2XlNlD5vHbRU2R6Cb0xIirCk6Fx6cK
JutT1ZbvsFDNKGOBRuVNBoMVV4GJe0nSvvQVtVXOGq/USHwJvrT9VlIrGAhMcRKpmayoOgU1cegs
CaDbjlEMqJESSARgwZOesgKhpFIjLsHCai7ZA6rKioU0s0CH3NJUKjqdHBnTdTZdg0y1MziEnppN
EoCcmqjKOwyXcaF3szcZ6io4tEKOzp+ikl1/9X/j+y+wGPh8y0h7075DB1t/Yx8hviojxxFj5F0t
FX8af4H7NDktPtgMHK6PedG47fzj5+xJ1jg5RuurAjR9EeDJyPztoVnk8i3pkvn+Wz08/I2eZp/D
9RUCz7+9LOqydJSayIGg9pxPrTZLhMe7vclDbrSMz5NPN0OF6Yy8yE1fQne7Y4mm/TpFlh0kqMEs
Q6GYx5tuggz4bDA+uKi2ff183ztZ1ZoVQb+vCNx66XVibo6d/HOz8+VGHFp/NxCnwbLEzplCOyt2
3Hhsg1COoen6d0gbaJjI3EC4/1li0xaXD2OdjmHT5Iv4LhJmbIPD1aCp5gSsRuiVK7bo9E0cLinc
V0aAJmNC6lh6hVevfrzwvCRlcGnOgq3Th3K8ZduwzDXXsEjWoGwWo2wCxfyGIOC5wSaQnJNvb9r1
y26339KqT667xEj2fZP7j3bVbpwNs4QIZk76p8PFx8FPHGKT3JpJNmZTUAIOcMDLuXpGHbH7MlRy
XaSTFjMzJzAydZ26/Ps0+uZKtGaYKsILdvoLTSlaDpMuL12BXD/WWVSnYb4O3OZc4DUtLu1zU7d/
LkUh+VJFFbb3OcmHJHWzkV1+xxCEuy9WxV0ISlHkmT1K6L8rFOl5kDnqg8mpt8f0CyxiwNDtz9qL
pMSqzPM0k5DehN33JxdgKDccMFVWqt0E58riFgVK5osrYZV+Mlwib16zStR1ckpZt0bvMw9wpKCb
RtDUxQuqh61rHJcxPDQV6v1aunCsXsGZm+B/8XckU4UJDYinngA=


--===============1024805480==--