* Fix for DOS short filenames.

This commit is contained in:
Paul Smith 1999-09-29 06:29:38 +00:00
parent dbb8f3e30b
commit f26e413b12
2 changed files with 15 additions and 8 deletions

View file

@ -1,3 +1,10 @@
1999-09-29 Paul D. Smith <psmith@gnu.org>
* 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 <psmith@gnu.org> 1999-09-23 Paul D. Smith <psmith@gnu.org>
* scripts/features/parallelism: Add a check to ensure that the * scripts/features/parallelism: Add a check to ensure that the

View file

@ -62,7 +62,7 @@ sub toplevel
$cwd = "."; # don't we wish we knew $cwd = "."; # don't we wish we knew
$cwdslash = ""; # $cwd . $pathsep, but "" rather than "./" $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 &set_defaults; # suite-defined
@ -173,12 +173,12 @@ sub get_osname
# See if the filesystem supports long file names with multiple # See if the filesystem supports long file names with multiple
# dots. DOS doesn't. # dots. DOS doesn't.
$fancy_file_names = 1; $short_filenames = 0;
(open (TOUCHFD, "> fancy.file.name") && close (TOUCHFD)) (open (TOUCHFD, "> fancy.file.name") && close (TOUCHFD))
|| ($fancy_file_names = 0); || ($short_filenames = 1);
unlink ("fancy.file.name") || ($fancy_file_names = 0); 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 # 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 # 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).) # 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); chdir (".ostest") || &error ("Couldn't chdir to .ostest: $!\n", 1);
} }
if ($fancy_file_names && -f "ick") if (! $short_filenames && -f "ick")
{ {
$osname = "vos"; $osname = "vos";
$vos = 1; $vos = 1;
@ -219,7 +219,7 @@ sub get_osname
$pathsep = "/"; $pathsep = "/";
} }
if ($fancy_file_names) { if (! $short_filenames) {
chdir ("..") || &error ("Couldn't chdir to ..: $!\n", 1); chdir ("..") || &error ("Couldn't chdir to ..: $!\n", 1);
unlink (".ostest>ick"); unlink (".ostest>ick");
rmdir (".ostest") || &error ("Couldn't rmdir .ostest: $!\n", 1); rmdir (".ostest") || &error ("Couldn't rmdir .ostest: $!\n", 1);
@ -363,7 +363,7 @@ sub run_each_test
$testpath = "$workpath$pathsep$testname"; $testpath = "$workpath$pathsep$testname";
# Leave enough space in the extensions to append a number, even # Leave enough space in the extensions to append a number, even
# though it needs to fit into 8+3 limits. # though it needs to fit into 8+3 limits.
if ($port_host eq 'DOS') { if ($short_filenames) {
$logext = 'l'; $logext = 'l';
$diffext = 'd'; $diffext = 'd';
$baseext = 'b'; $baseext = 'b';