bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3205)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedpm5lavua6k

 3205 Magnus Blåudd	2009-11-08
      ndbinfo
       - Make mtr run testNdbinfo

    added:
      mysql-test/suite/ndb/t/test_ndbinfo.test
=== added file 'mysql-test/suite/ndb/t/test_ndbinfo.test'
--- a/mysql-test/suite/ndb/t/test_ndbinfo.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/test_ndbinfo.test	2009-11-08 19:47:39 +0000
@@ -0,0 +1,52 @@
+--result_format 2
+--perl
+use strict;
+
+use strict;
+use lib "lib/";
+use My::Find;
+use File::Basename;
+use IO::File;
+
+#
+# Check if the needed executable is available
+#
+my $mysql_test_dir = $ENV{MYSQL_TEST_DIR} or die "Need MYSQL_TEST_DIR";
+my $basedir = dirname($mysql_test_dir);
+my $test_exe = my_find_bin($basedir,
+		           ["storage/ndb/test/ndbapi", "bin"],
+                           "testNdbinfo", NOT_REQUIRED);
+
+#
+# Communicate the location of the executable to the test
+# by creating a temporary include file
+#
+
+my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
+
+my $F = IO::File->new("$vardir/tmp/test_ndbinfo.inc", "w") or die;
+if ($test_exe)
+{
+  print $F "let \$TEST_NDBINFO=$test_exe;\n";
+}
+else
+{
+  print $F "skip Could not find testNdbinfo;";
+}
+EOF
+
+--source $MYSQLTEST_VARDIR/tmp/test_ndbinfo.inc
+
+let $log_file=$MYSQLTEST_VARDIR/tmp/test_ndbinfo.log;
+
+--exec $TEST_NDBINFO -n Ndbinfo > $log_file 2>&1
+--exec $TEST_NDBINFO -n Ndbinfo10 > $log_file 2>&1
+--exec $TEST_NDBINFO -n ScanAll > $log_file 2>&1
+--exec $TEST_NDBINFO -n ScanStop > $log_file 2>&1
+## Disable RateLimit temporarily, it hangs when scanning log_space
+#--exec $TEST_NDBINFO -n RateLimit > $log_file 2>&1
+--exec $TEST_NDBINFO -n TestTable > $log_file 2>&1
+
+echo Sucessfully executed $TEST_NDBINFO;
+
+exit;

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