47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
|
diff -rNU 20 ../make-4.0-o/tests/test_driver.pl ./tests/test_driver.pl
|
||
|
|
--- ../make-4.0-o/tests/test_driver.pl 2013-10-09 08:05:39.000000000 +0200
|
||
|
|
+++ ./tests/test_driver.pl 2014-03-11 14:08:15.000000000 +0100
|
||
|
|
@@ -33,41 +33,41 @@
|
||
|
|
|
||
|
|
# The number of test categories we've run
|
||
|
|
$categories_run = 0;
|
||
|
|
# The number of test categroies that have passed
|
||
|
|
$categories_passed = 0;
|
||
|
|
# The total number of individual tests that have been run
|
||
|
|
$total_tests_run = 0;
|
||
|
|
# The total number of individual tests that have passed
|
||
|
|
$total_tests_passed = 0;
|
||
|
|
# The number of tests in this category that have been run
|
||
|
|
$tests_run = 0;
|
||
|
|
# The number of tests in this category that have passed
|
||
|
|
$tests_passed = 0;
|
||
|
|
|
||
|
|
|
||
|
|
# Yeesh. This whole test environment is such a hack!
|
||
|
|
$test_passed = 1;
|
||
|
|
|
||
|
|
|
||
|
|
# Timeout in seconds. If the test takes longer than this we'll fail it.
|
||
|
|
-$test_timeout = 5;
|
||
|
|
+$test_timeout = 8;
|
||
|
|
|
||
|
|
# Path to Perl
|
||
|
|
$perl_name = $^X;
|
||
|
|
|
||
|
|
# %makeENV is the cleaned-out environment.
|
||
|
|
%makeENV = ();
|
||
|
|
|
||
|
|
# %extraENV are any extra environment variables the tests might want to set.
|
||
|
|
# These are RESET AFTER EVERY TEST!
|
||
|
|
%extraENV = ();
|
||
|
|
|
||
|
|
# %origENV is the caller's original environment
|
||
|
|
%origENV = %ENV;
|
||
|
|
|
||
|
|
sub resetENV
|
||
|
|
{
|
||
|
|
# We used to say "%ENV = ();" but this doesn't work in Perl 5.000
|
||
|
|
# through Perl 5.004. It was fixed in Perl 5.004_01, but we don't
|
||
|
|
# want to require that here, so just delete each one individually.
|
||
|
|
foreach $v (keys %ENV) {
|