mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
Merge romeo.(none):/home/bkroot/mysql-5.1-new-maint
into romeo.(none):/home/bk/mytap-mysql-5.1-new-maint
This commit is contained in:
commit
7a1ccf90d4
2 changed files with 8 additions and 25 deletions
|
@ -37,3 +37,10 @@ directory and add the following to the Makefile.am in that directory
|
||||||
Note, it's important to have "-t" at the end of the filename, otherwise the
|
Note, it's important to have "-t" at the end of the filename, otherwise the
|
||||||
test won't be executed by 'make test' !
|
test won't be executed by 'make test' !
|
||||||
|
|
||||||
|
|
||||||
|
Documentation
|
||||||
|
-------------
|
||||||
|
|
||||||
|
There is Doxygen-generated documentation available at:
|
||||||
|
|
||||||
|
https://intranet.mysql.com/~mkindahl/mytap/html/
|
||||||
|
|
|
@ -1,19 +1,5 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
# Override _command_line in the standard Perl test harness to prevent
|
|
||||||
# it from using "perl" to run the test scripts.
|
|
||||||
package MySQL::Straps;
|
|
||||||
|
|
||||||
use base qw(Test::Harness::Straps);
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
|
|
||||||
sub _command_line {
|
|
||||||
return $_[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
package main;
|
|
||||||
|
|
||||||
use Test::Harness qw(&runtests $verbose);
|
use Test::Harness qw(&runtests $verbose);
|
||||||
use File::Find;
|
use File::Find;
|
||||||
|
|
||||||
|
@ -37,9 +23,6 @@ unit - Run unit tests in directory
|
||||||
|
|
||||||
my $cmd = shift;
|
my $cmd = shift;
|
||||||
|
|
||||||
# $Test::Harness::Verbose = 1;
|
|
||||||
# $Test::Harness::Debug = 1;
|
|
||||||
|
|
||||||
if (defined $cmd && exists $dispatch{$cmd}) {
|
if (defined $cmd && exists $dispatch{$cmd}) {
|
||||||
$dispatch{$cmd}->(@ARGV);
|
$dispatch{$cmd}->(@ARGV);
|
||||||
} else {
|
} else {
|
||||||
|
@ -95,14 +78,7 @@ sub run_cmd (@) {
|
||||||
if (@files > 0) {
|
if (@files > 0) {
|
||||||
# Removing the first './' from the file names
|
# Removing the first './' from the file names
|
||||||
foreach (@files) { s!^\./!! }
|
foreach (@files) { s!^\./!! }
|
||||||
|
$ENV{'HARNESS_PERL_SWITCHES'} .= q" -e 'exec @ARGV'";
|
||||||
# Install the strap above instead of the default strap. Since
|
|
||||||
# we are replacing the straps under the feet of Test::Harness,
|
|
||||||
# we need to do some basic initializations in the new straps.
|
|
||||||
$Test::Harness::Strap = MySQL::Straps->new;
|
|
||||||
$Test::Harness::Strap->{callback} = \&Test::Harness::strap_callback
|
|
||||||
if defined &Test::Harness::strap_callback;
|
|
||||||
|
|
||||||
runtests @files;
|
runtests @files;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue