database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

storage/maria/unittest/ma_test_all-t

Browse Source 
1. reasonable defaults for maria_path
    2. reasonable TAP-compatible output in non-verbose mode
unittest/Makefile.am
    remove maria_path hack
BitKeeper/etc/ignore@1.269
    added maria_log.00000* ma_test_recovery.output test?.MA?


BitKeeper/etc/ignore:
  added maria_log.00000* ma_test_recovery.output test?.MA?
storage/maria/unittest/ma_test_all-t:
  1. reasonable defaults for maria_path
  2. reasonable TAP-compatible output in non-verbose mode
unittest/Makefile.am:
  remove maria_path hack
This commit is contained in:
unknown
2008-01-29 15:26:04 +01:00
parent e4e8418ced
commit 71eb292f37
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.bzrignore
View File

@@ -3073,3 +3073,6 @@ libmysqld/sql_profile.cc
comments comments
maria-win.patch maria-win.patch
storage/maria/maria_dump_log storage/maria/maria_dump_log
maria_log.00000*
ma_test_recovery.output
test?.MA?

12
storage/maria/unittest/ma_test_all-t
View File

@@ -4,6 +4,7 @@
# #
use Getopt::Long; use Getopt::Long;
use File::Basename;
$|= 1; $|= 1;
$VER= "1.3"; $VER= "1.3";
@@ -56,8 +57,9 @@ sub run_tests
} }
if (!defined($maria_path) || !length($maria_path)) if (!defined($maria_path) || !length($maria_path))
{ {
$maria_path= "."; $maria_path= dirname($0) . '/..';
} }
$ENV{'maria_path'}=$maria_path;
usage() if ($opt_help || $flag_exit); usage() if ($opt_help || $flag_exit);
@@ -524,12 +526,17 @@ sub ok
print " " x (5 - length("$test_counter")); print " " x (5 - length("$test_counter"));
print "$test_counter"; print "$test_counter";
} }
else
{
print " $test_counter - $com"
}
print "\n"; print "\n";
return 1; return 1;
} }
print "[ " if ($verbose); print "[ " if ($verbose);
print "not ok"; print "not ok";
print " ]" if ($verbose); print " ]" if ($verbose);
print " $test_counter - $com" unless $verbose;
print "\n"; print "\n";
if ($verbose && defined($output) && length($output)) if ($verbose && defined($output) && length($output))
{ {
@@ -612,9 +619,6 @@ $my_progname version $VER
Description: Description:
Run various Maria related tests. Typically used via make test as a unittest. 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 Options
--help Show this help and exit. --help Show this help and exit.

4
unittest/Makefile.am
View File

@@ -21,10 +21,10 @@ CLEANFILES = unit
unittests = mytap mysys @mysql_se_unittest_dirs@ @mysql_pg_unittest_dirs@ unittests = mytap mysys @mysql_se_unittest_dirs@ @mysql_pg_unittest_dirs@
test: test:
maria_path=../storage/maria perl unit.pl run $(unittests) perl unit.pl run $(unittests)
test-verbose: 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 # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%