bzr commit into mysql-5.1-telco-6.3-ndbjtie branch (jdd:3101)

[John David Duncan]

#At file:///Users/jdd/Desktop/dev/6.3-ndbjtie/ based on revid:jdd@stripped

 3101 John David Duncan	2009-11-07 [merge]
      Merge changes from Jorgen

    modified:
      mysql-test/Makefile.am
      mysql-test/suite/ndb/include/have_ndbjtie.inc
      mysql-test/suite/ndb/include/have_ndbjtie_junit.inc
      mysql-test/suite/ndb/t/ndb_jtie.test
=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2009-10-01 05:56:05 +0000
+++ b/mysql-test/Makefile.am	2009-11-05 20:54:15 +0000
@@ -98,7 +98,7 @@ TEST_DIRS = t r include std_data std_dat
 	suite/rpl suite/rpl/include suite/rpl/r \
 	suite/rpl/t \
 	suite/stress/include suite/stress/t suite/stress/r \
-	suite/ndb suite/ndb/t suite/ndb/r \
+	suite/ndb suite/ndb/t suite/ndb/r suite/ndb/include \
 	suite/ndb_binlog suite/ndb_binlog/t suite/ndb_binlog/r \
 	suite/ndb_team suite/ndb_team/t suite/ndb_team/r \
 	suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \

=== modified file 'mysql-test/suite/ndb/include/have_ndbjtie.inc'
--- a/mysql-test/suite/ndb/include/have_ndbjtie.inc	2009-11-03 08:56:46 +0000
+++ b/mysql-test/suite/ndb/include/have_ndbjtie.inc	2009-11-05 20:54:15 +0000
@@ -22,15 +22,33 @@ my $basedir = dirname($mysql_test_dir);
 #
 my $ver = $ENV{MYSQL_SERVER_VERSION};
 my $jtie_jar = my_find_file($basedir,
-                            ["storage/ndb/ndbjtie/src", "bin"],
+                            ["storage/ndb/ndbjtie/src", "share/mysql/java"],
                             "mysql-$ver-ndbjtie.jar", NOT_REQUIRED);
 
+my $ndbclient_lib = my_find_file($basedir,
+                                ["storage/ndb/src/.libs", "lib/mysql"],
+                                ["libndbclient.dll", "libndbclient.so", "libndbclient.dylib"],
+                                NOT_REQUIRED);
+
+my $ndbjtie_lib = my_find_file($basedir,
+                               ["storage/ndb/ndbjtie/src/.libs", "lib/mysql"],
+                               ["libndbjtie.dll", "libndbjtie.so", "libndbjtie.dylib"],
+                               NOT_REQUIRED);
+
 my $F = IO::File->new("$vardir/tmp/have_ndbjtie_result.inc", "w") or die;
 if ($jtie_jar) {
-  my $jtie_dir=dirname(dirname($jtie_jar));
-  print $F "--let \$NDBJTIE_JAR= $jtie_jar\n";
-  print $F "--let \$NDBJTIE_DIR= $jtie_dir\n";
-  print $F "--echo Found ndbjtie.jar: '\$NDBJTIE_JAR'\n"
+  my $jtie_dir = dirname(dirname($jtie_jar));
+  if ($ndbjtie_lib && $ndbclient_lib) {
+    my $ndbjtie_lib_dir = dirname($ndbjtie_lib);
+    my $ndbclient_lib_dir = dirname($ndbclient_lib);
+    print $F "--let \$NDBJTIE_JAR= $jtie_jar\n"; 
+    print $F "--let \$NDBJTIE_DIR= $jtie_dir\n";
+    print $F "--let \$NDBJTIE_LIB_DIR= $ndbjtie_lib_dir\n";
+    print $F "--let \$NDBCLIENT_LIB_DIR= $ndbclient_lib_dir\n";
+    print $F "--echo Found ndbjtie.jar: '\$NDBJTIE_JAR'\n"
+  } else {
+    print $F "skip Found ndbjtie.jar: '\$NDBJTIE_JAR', but not libndbjtie ($ndbjtie_lib) or libndbclient ($ndbclient_lib)\n"
+  }
 } else {
   print $F "skip Could not find NDB JTie jar file, version string: '$ver';\n";
 }

=== modified file 'mysql-test/suite/ndb/include/have_ndbjtie_junit.inc'
--- a/mysql-test/suite/ndb/include/have_ndbjtie_junit.inc	2009-11-03 08:56:46 +0000
+++ b/mysql-test/suite/ndb/include/have_ndbjtie_junit.inc	2009-11-05 20:54:15 +0000
@@ -20,15 +20,17 @@ my $basedir = dirname($mysql_test_dir);
 #
 # Check if the needed tests are available
 #
+my $ver = $ENV{MYSQL_SERVER_VERSION};
 my $jtie_junit = my_find_file($basedir,
-                              ["storage/ndb/ndbjtie/test/test", "bin"],
-                              "NdbJTieSmokeTest.class", NOT_REQUIRED);
+                            ["storage/ndb/ndbjtie/test", "share/mysql/java"],
+                            "mysql-$ver-ndbjtie-test.jar", NOT_REQUIRED);
 
 my $F = IO::File->new("$vardir/tmp/have_ndbjtie_junit_result.inc", "w") or die;
 if ($jtie_junit) {
-  my $jtie_junit_dir = dirname(dirname($jtie_junit));
-  print $F "--let \$NDBJTIE_JUNIT= $jtie_junit_dir;\n";
-  print $F "--echo Found NDB JTie JUnit tests: '\$NDBJTIE_JUNIT'\n"
+  my $jtie_junit_dir = dirname($jtie_junit);
+  print $F "--let \$NDBJTIE_JUNIT= $jtie_junit_dir\n";
+  print $F "--let \$NDBJTIE_JUNIT_JAR= $jtie_junit\n";
+  print $F "--echo Found NDB JTie JUnit tests: '\$NDBJTIE_JUNIT_JAR'\n"
 } else {
   print $F "skip Could not find NDB JTie JUnit tests;\n";
 }

=== modified file 'mysql-test/suite/ndb/t/ndb_jtie.test'
--- a/mysql-test/suite/ndb/t/ndb_jtie.test	2009-11-03 11:46:12 +0000
+++ b/mysql-test/suite/ndb/t/ndb_jtie.test	2009-11-05 20:54:15 +0000
@@ -6,9 +6,9 @@
 --source suite/ndb/include/have_ndbjtie.inc
 --source suite/ndb/include/have_ndbjtie_junit.inc
 
---let $JUNIT_CLASSPATH=$NDBJTIE_DIR/test:$NDBJTIE_JAR
+--let $JUNIT_CLASSPATH=$NDBJTIE_JAR:$NDBJTIE_JUNIT_JAR
 --let $JUNIT_JVM_OPTS= -ea -Xcheck:jni -Djtie.unit.ndb.connectstring=$NDB_CONNECTSTRING
---let $JUNIT_JVM_OPTS= $JUNIT_JVM_OPTS -Djava.library.path="$NDBJTIE_DIR/../src/.libs/:$NDBJTIE_DIR/src/.libs/"
+--let $JUNIT_JVM_OPTS= $JUNIT_JVM_OPTS -Djava.library.path="$NDBCLIENT_LIB_DIR:$NDBJTIE_LIB_DIR"
 
 --let JUNIT_CLASS=test.MySqlUtilsSmokeTest
 --source include/run_junit.inc


Attachment: [text/bzr-bundle] bzr/[e-mail]