diff options
author | Paul Smith <psmith@gnu.org> | 2019-10-12 16:22:01 -0400 |
---|---|---|
committer | Paul Smith <psmith@gnu.org> | 2019-12-16 09:31:31 -0500 |
commit | 3822f77c1d10f4c0789a0262aab35adb00c8d22d (patch) | |
tree | 2509783777ca88606d596b3c669ec67614f8e1d9 /tests/run_make_tests.pl | |
parent | 1cf3932a39057789ca525afb02bcfc823b238cb7 (diff) | |
download | make-git-3822f77c1d10f4c0789a0262aab35adb00c8d22d.tar.gz |
Rename jhelp.pl to thelp.pl and make it a generic test helper.
* tests/thelp.pl: Rename from tests/jhelp.pl.
(op): Use names instead of options for the operations.
(op): Add new operations for sleep, mkdir, and rm.
(op): Enhance wait to time out
* tests/run_make_tests.pl: Add a new #HELPER# replacement
(subst_make_string): Use fully-qualified path to thelp.pl
* tests/scripts/features/parallelism: Update to use thelp.pl
and the new named operations. Use thelp.pl sleep instead of
system-specific sleep commands.
* tests/scripts/features/output-sync: Update to use thelp.pl
instead of complex shell scripts.
* Makefile.am: Distribute tests/thelp.pl instead of tests/jhelp.pl
Diffstat (limited to 'tests/run_make_tests.pl')
-rw-r--r-- | tests/run_make_tests.pl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl index b36de691..8cdf6c7f 100644 --- a/tests/run_make_tests.pl +++ b/tests/run_make_tests.pl @@ -31,6 +31,8 @@ use FindBin; use lib "$FindBin::Bin"; +our $testsroot = $FindBin::Bin; + require "test_driver.pl"; use File::Spec; @@ -52,10 +54,12 @@ $pure_log = undef; # The location of the GNU make source directory $srcdir = undef; +$fqsrcdir = undef; $srcvol = undef; # The location of the build directory $blddir = undef; +$fqblddir = undef; $bldvol = undef; $make_path = undef; @@ -226,6 +230,9 @@ sub subst_make_string s/#MAKE#/$make_name/g; s/#PERL#/$perl_name/g; s/#PWD#/$cwdpath/g; + my $help = File::Spec->catfile($fqsrcdir, 'tests', 'thelp.pl'); + # If we're using a shell + s/#HELPER#/$perl_name $help/g; return $_; } @@ -604,6 +611,10 @@ sub set_more_defaults -f File::Spec->catfile($1, 'src', 'gnumake.h') and $srcdir = $1; } + # At this point we should have srcdir and blddir: get fq versions + $fqsrcdir = File::Spec->rel2abs($srcdir); + $fqblddir = File::Spec->rel2abs($blddir); + # Get Purify log info--if any. if (exists $ENV{PURIFYOPTIONS} |