diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 18 | ||||
| -rwxr-xr-x | tests/testcurl.pl | 12 |
2 files changed, 17 insertions, 13 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6a968adf9..9a6f307d0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,24 +35,24 @@ curl: if CROSSCOMPILING TEST = @echo "NOTICE: we can't run the tests when cross-compiling!" -TEST_Q = $(TEST) -TEST_F = $(TEST) -TEST_T = $(TEST) +TEST_Q = +TEST_F = +TEST_T = else # if not cross-compiling: TEST = srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -TEST_Q = $(TEST) -s -a -TEST_F = $(TEST) -a -p -TEST_T = $(TEST) -t +TEST_Q = -s -a +TEST_F = -a -p +TEST_T = -t endif test: all $(TEST) quiet-test: all - $(TEST_Q) + $(TEST) $(TEST_Q) full-test: all - $(TEST_F) + $(TEST) $(TEST_F) torture-test: all - $(TEST_T) + $(TEST) $(TEST_T) diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 826299dd0..4cf20f549 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -46,6 +46,7 @@ # --mktarball=[command] Command to run after completed test # --name=[name] Set name to report as # --nocvsup Don't update from CVS even though it is a CVS tree +# --runtestsopts=[options] Options to pass to runtests.pl # --setup=[file name] File name to read setup from (deprecated) # --target=[your os] Specify your target environment. # @@ -62,8 +63,8 @@ use Cwd; use vars qw($version $fixed $infixed $CURLDIR $CVS $pwd $build $buildlog $buildlogname $configurebuild $targetos $confsuffix $binext $libext); -use vars qw($name $email $desc $confopts $setupfile $mktarball $nocvsup - $crosscompile); +use vars qw($name $email $desc $confopts $runtestopts $setupfile $mktarball + $nocvsup $crosscompile); # version of this script $version='$Revision$'; @@ -104,6 +105,9 @@ while ($ARGV[0]) { $crosscompile=1; shift @ARGV; } + elsif ($ARGV[0] =~ /--runtestopts=/) { + $runtestopts = (split(/=/, shift @ARGV, 2))[1]; + } else { $CURLDIR=shift @ARGV; $CVS=0; @@ -517,8 +521,8 @@ elsif(!$crosscompile) { } if ($configurebuild && !$crosscompile) { - logit "run make test-full"; - open(F, "make test-full 2>&1 |") or die; + logit "run make TEST_F=\"$runtestopts\" test-full"; + open(F, "make TEST_F=\"$runtestopts\" test-full 2>&1 |") or die; open(LOG, ">$buildlog") or die; while (<F>) { s/$pwd//g; |