Commit 75c8e2f4 authored by unknown's avatar unknown

Fix for ma_test_all-t failure and dbug/tests-t failure on Solaris:

on that machine, "perl" calls /usr/local/bin/perl (so this is what
runs unittest's unit.pl), while some test scripts (ma_test_recovery.pl
etc) use /usr/bin/perl which seems to either conflict with /usr/local/bin/perl
or have problems of its own (Perl errors when loading modules).
Instead we use perl from the PATH. /usr/bin/env seems to be available
on lots of Unix machines.


dbug/tests-t.pl:
  look for perl in PATH
storage/maria/unittest/ma_test_all-t:
  Look for perl in PATH
storage/maria/unittest/ma_test_recovery.pl:
  Look for perl in PATH. Close MY_LOG to flush buffers to that diff sees
  the whole file
parent 28131daa
#!/usr/bin/perl #!/usr/bin/env perl
# #
# A driver program to test DBUG features - runs tests (shell commands) # A driver program to test DBUG features - runs tests (shell commands)
......
#!/usr/bin/perl -w #!/usr/bin/env perl
# #
# Run various unit tests. # Run various unit tests.
# #
...@@ -7,6 +7,7 @@ use Getopt::Long; ...@@ -7,6 +7,7 @@ use Getopt::Long;
use File::Basename; use File::Basename;
$|= 1; $|= 1;
$^W = 1; # warnings, because env cannot parse 'perl -w'
$VER= "1.3"; $VER= "1.3";
$opt_version= 0; $opt_version= 0;
......
#!/usr/bin/perl -w #!/usr/bin/env perl
use Getopt::Long; use Getopt::Long;
use File::Copy; use File::Copy;
...@@ -7,6 +7,7 @@ use File::Basename; ...@@ -7,6 +7,7 @@ use File::Basename;
use Digest::MD5; use Digest::MD5;
$|= 1; $|= 1;
$^W = 1; # warnings, because env cannot parse 'perl -w'
$VER= "1.2"; $VER= "1.2";
$opt_version= 0; $opt_version= 0;
...@@ -243,6 +244,7 @@ sub main ...@@ -243,6 +244,7 @@ sub main
exit(1); exit(1);
} }
close(MY_LOG);
# also note that maria_chk -dvv shows differences for ma_test2 in UNDO phase, # also note that maria_chk -dvv shows differences for ma_test2 in UNDO phase,
# this is normal: removing records does not shrink the data/key file, # this is normal: removing records does not shrink the data/key file,
# does not put back the "analyzed,optimized keys"(etc) index state. # does not put back the "analyzed,optimized keys"(etc) index state.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment