bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4670 to 4671)

[magnus.blaudd]

 4671 magnus.blaudd@stripped	2012-11-22
      clusterj
       - undo the removal of have_junit.inc, it's still used in 7.1

    added:
      mysql-test/suite/ndb/include/have_junit.inc
 4670 magnus.blaudd@stripped	2012-11-21
      clusterj
       - look for java before starting to care about what's in classpath
       - theoretically we could use java to check if classpath is correct by doing
        configure style tests written in java. Would avoid need to duplicate classpath
        parsing(which won't have the same rules as in java anyway)

    modified:
      mysql-test/suite/ndb/t/clusterj.test
      mysql-test/suite/ndb/t/clusterj_jpa.test
=== added file 'mysql-test/suite/ndb/include/have_junit.inc'
--- a/mysql-test/suite/ndb/include/have_junit.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/include/have_junit.inc	2012-11-22 07:01:53 +0000
@@ -0,0 +1,42 @@
+--perl
+use strict;
+use IO::File;
+use lib "lib/";
+use My::Platform;
+
+my $ok = 0;
+my $classpath = $ENV{'MTR_CLASSPATH'} || '';
+my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
+my $jar;
+my $notfound;
+my $sep = (IS_WINDOWS) ? ';' : ':';
+
+# -- look for the junit jar file
+foreach $jar (split $sep, $classpath) {
+  if($jar =~ m/junit/  && -f $jar) {
+    $ok = 2;
+    last;
+  }
+  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($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
+
+--source $MYSQLTEST_VARDIR/tmp/have_junit_result.inc

No bundle (reason: useless for push emails).