diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 15 | ||||
| -rwxr-xr-x | tests/run_make_tests.pl | 11 | ||||
| -rw-r--r-- | tests/scripts/features/vpathplus | 4 | ||||
| -rw-r--r-- | tests/scripts/targets/INTERMEDIATE | 9 | ||||
| -rw-r--r-- | tests/scripts/targets/SECONDARY | 8 |
5 files changed, 32 insertions, 15 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 368a30c..231c486 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -2,6 +2,21 @@ * scripts/features/patspecific_vars: Add a test for PR/1407. +2000-02-02 Paul D. Smith <psmith@gnu.org> + + * run_make_tests.pl (set_more_defaults): Hard-code the LANG to C + to make sure porting order, etc. is predictable. + Reported by Andreas Jaeger <aj@suse.de>. + + * run_make_tests.pl (set_more_defaults): Set the $wtime variable + depending on the OS. Eli Zaretskii <eliz@is.elta.co.il> reports + this seems to need to be *4* on DOS/Windows, not just 2. Keep it + 1 for other systems. + * scripts/features/vpathplus (touchfiles): Use the $wtime value + instead of hardcoding 2. + * scripts/targets/SECONDARY: Ditto. + * scripts/targets/INTERMEDIATE: Ditto. + 2000-01-23 Paul D. Smith <psmith@gnu.org> * scripts/features/include: Remove a check; the fix caused more diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl index 70b1cf8..baf55f8 100755 --- a/tests/run_make_tests.pl +++ b/tests/run_make_tests.pl @@ -129,6 +129,11 @@ sub set_more_defaults local($string); local($index); + # Make sure we're in the C locale for those systems that support it, + # so sorting, etc. is predictable. + # + $ENV{LANG} = 'C'; + # find the type of the port. We do this up front to have a single # point of change if it needs to be tweaked. # @@ -152,6 +157,12 @@ sub set_more_defaults $port_type = 'UNIX'; } + # On DOS/Windows system the filesystem apparently can't track + # timestamps with second granularity (!!). Change the sleep time + # needed to force a file to be considered "old". + # + $wtime = $port_type eq 'UNIX' ? 1 : 4; + # Find the full pathname of Make. For DOS systems this is more # complicated, so we ask make itself. diff --git a/tests/scripts/features/vpathplus b/tests/scripts/features/vpathplus index 6c9a2a0..76312b3 100644 --- a/tests/scripts/features/vpathplus +++ b/tests/scripts/features/vpathplus @@ -57,12 +57,10 @@ close(MAKEFILE); sub touchfiles { foreach (@_) { + sleep($wtime); ($f = $_) =~ s,VP/,$VP,g; &touch($f); push(@touchedfiles, $f); - # Sleep 2 seconds for DOS/Windows FAT volumes which have 2-second - # granularity of file times. - sleep(2); } } diff --git a/tests/scripts/targets/INTERMEDIATE b/tests/scripts/targets/INTERMEDIATE index a1df8bf..7041e83 100644 --- a/tests/scripts/targets/INTERMEDIATE +++ b/tests/scripts/targets/INTERMEDIATE @@ -35,6 +35,7 @@ close(MAKEFILE); &touch('foo.f'); &touch('bar.f'); +sleep($wtime); &run_make_with_options($makefile,'foo.d',&get_logfile); $answer = "cp foo.f foo.e\ncp foo.e foo.d\nrm foo.e\n"; @@ -48,9 +49,7 @@ $answer = "$make_name: `foo.d' is up to date.\n"; # TEST #2 -# Sleep 2 seconds for DOS/Windows FAT volumes which have 2-second -# granularity of file times. -sleep(2); +sleep($wtime); &touch('foo.f'); &run_make_with_options($makefile,'foo.d',&get_logfile); @@ -71,9 +70,7 @@ $answer = "$make_name: `foo.c' is up to date.\n"; # TEST #5 -# Sleep 2 seconds for DOS/Windows FAT volumes which have 2-second -# granularity of file times. -sleep(2); +sleep($wtime); &touch('foo.f'); &run_make_with_options($makefile,'foo.c',&get_logfile); diff --git a/tests/scripts/targets/SECONDARY b/tests/scripts/targets/SECONDARY index dbf052d..3ae34fd 100644 --- a/tests/scripts/targets/SECONDARY +++ b/tests/scripts/targets/SECONDARY @@ -49,9 +49,7 @@ $answer = "$make_name: `foo.d' is up to date.\n"; # TEST #3 -# Sleep 2 seconds for DOS/Windows FAT volumes which have 2-second -# granularity of file times. -sleep(2); +sleep($wtime); &touch('foo.f'); &run_make_with_options($makefile,'foo.d',&get_logfile); @@ -74,9 +72,7 @@ $answer = "$make_name: `foo.c' is up to date.\n"; # TEST #6 -# Sleep 2 seconds for DOS/Windows FAT volumes which have 2-second -# granularity of file times. -sleep(2); +sleep($wtime); &touch('foo.f'); &run_make_with_options($makefile,'foo.c',&get_logfile); |