diff options
| -rw-r--r-- | .bzrignore | 3 | ||||
| -rwxr-xr-x | storage/maria/unittest/ma_test_all-t | 12 | ||||
| -rw-r--r-- | unittest/Makefile.am | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/.bzrignore b/.bzrignore index 3b65e8d24e4..9c60fecca1c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3073,3 +3073,6 @@ libmysqld/sql_profile.cc comments maria-win.patch storage/maria/maria_dump_log +maria_log.00000* +ma_test_recovery.output +test?.MA? diff --git a/storage/maria/unittest/ma_test_all-t b/storage/maria/unittest/ma_test_all-t index 33a8d711ef7..7fe3269ce8b 100755 --- a/storage/maria/unittest/ma_test_all-t +++ b/storage/maria/unittest/ma_test_all-t @@ -4,6 +4,7 @@ # use Getopt::Long; +use File::Basename; $|= 1; $VER= "1.3"; @@ -56,8 +57,9 @@ sub run_tests } if (!defined($maria_path) || !length($maria_path)) { - $maria_path= "."; + $maria_path= dirname($0) . '/..'; } + $ENV{'maria_path'}=$maria_path; usage() if ($opt_help || $flag_exit); @@ -524,12 +526,17 @@ sub ok print " " x (5 - length("$test_counter")); print "$test_counter"; } + else + { + print " $test_counter - $com" + } print "\n"; return 1; } print "[ " if ($verbose); print "not ok"; print " ]" if ($verbose); + print " $test_counter - $com" unless $verbose; print "\n"; if ($verbose && defined($output) && length($output)) { @@ -612,9 +619,6 @@ $my_progname version $VER Description: Run various Maria related tests. Typically used via make test as a unittest. -Please set environment variable maria_path before executing, if you -are not starting the program where ma_test1, ma_test2, ma_test3, -ma_test_recovery etc. files are. Options --help Show this help and exit. diff --git a/unittest/Makefile.am b/unittest/Makefile.am index e9eb6737ce5..8684fd3fc7d 100644 --- a/unittest/Makefile.am +++ b/unittest/Makefile.am @@ -21,10 +21,10 @@ CLEANFILES = unit unittests = mytap mysys @mysql_se_unittest_dirs@ @mysql_pg_unittest_dirs@ test: - maria_path=../storage/maria perl unit.pl run $(unittests) + perl unit.pl run $(unittests) test-verbose: - HARNESS_VERBOSE=1 maria_path=../storage/maria perl unit.pl run $(unittests) + HARNESS_VERBOSE=1 perl unit.pl run $(unittests) # Don't update the files from bitkeeper %::SCCS/s.% |