From f26e413b12a8a3ec4681be7f74abf7dbb88ac20a Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 29 Sep 1999 06:29:38 +0000 Subject: [PATCH] * Fix for DOS short filenames. --- tests/ChangeLog | 7 +++++++ tests/test_driver.pl | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index f8f67004..871cab98 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,10 @@ +1999-09-29 Paul D. Smith + + * test_driver.pl (get_osname): Change $fancy_file_names to + $short_filenames and reverse the logic. + (run_each_test): Change test of non-existent $port_host to use + $short_filenames--problem reported by Eli Zaretskii. + 1999-09-23 Paul D. Smith * scripts/features/parallelism: Add a check to ensure that the diff --git a/tests/test_driver.pl b/tests/test_driver.pl index 8e388136..4fb738b4 100644 --- a/tests/test_driver.pl +++ b/tests/test_driver.pl @@ -62,7 +62,7 @@ sub toplevel $cwd = "."; # don't we wish we knew $cwdslash = ""; # $cwd . $pathsep, but "" rather than "./" - &get_osname; # sets $osname, $vos, $pathsep, and $fancy_file_names + &get_osname; # sets $osname, $vos, $pathsep, and $short_filenames &set_defaults; # suite-defined @@ -173,12 +173,12 @@ sub get_osname # See if the filesystem supports long file names with multiple # dots. DOS doesn't. - $fancy_file_names = 1; + $short_filenames = 0; (open (TOUCHFD, "> fancy.file.name") && close (TOUCHFD)) - || ($fancy_file_names = 0); - unlink ("fancy.file.name") || ($fancy_file_names = 0); + || ($short_filenames = 1); + unlink ("fancy.file.name") || ($short_filenames = 1); - if ($fancy_file_names) { + if (! $short_filenames) { # Thanks go to meyering@cs.utexas.edu (Jim Meyering) for suggesting a # better way of doing this. (We used to test for existence of a /mnt # dir, but that apparently fails on an SGI Indigo (whatever that is).) @@ -190,7 +190,7 @@ sub get_osname chdir (".ostest") || &error ("Couldn't chdir to .ostest: $!\n", 1); } - if ($fancy_file_names && -f "ick") + if (! $short_filenames && -f "ick") { $osname = "vos"; $vos = 1; @@ -219,7 +219,7 @@ sub get_osname $pathsep = "/"; } - if ($fancy_file_names) { + if (! $short_filenames) { chdir ("..") || &error ("Couldn't chdir to ..: $!\n", 1); unlink (".ostest>ick"); rmdir (".ostest") || &error ("Couldn't rmdir .ostest: $!\n", 1); @@ -363,7 +363,7 @@ sub run_each_test $testpath = "$workpath$pathsep$testname"; # Leave enough space in the extensions to append a number, even # though it needs to fit into 8+3 limits. - if ($port_host eq 'DOS') { + if ($short_filenames) { $logext = 'l'; $diffext = 'd'; $baseext = 'b';