diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/test_driver.pl | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index a692f43..3ff614d 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2002-04-21 Paul D. Smith <psmith@gnu.org> + + * test_driver.pl (compare_dir_tree): Ignore CVS and RCS + directories in the script directories. + 2001-05-02 Paul D. Smith <psmith@gnu.org> * scripts/variables/flavors: Test define/endef scripts where only diff --git a/tests/test_driver.pl b/tests/test_driver.pl index 18dcc4b..a7a3b9f 100644 --- a/tests/test_driver.pl +++ b/tests/test_driver.pl @@ -113,7 +113,7 @@ sub toplevel print "Finding tests...\n"; opendir (SCRIPTDIR, $scriptpath) || &error ("Couldn't opendir $scriptpath: $!\n"); - @dirs = readdir (SCRIPTDIR); + @dirs = grep (!/^(\.\.?|CVS|RCS)$/, readdir (SCRIPTDIR) ); closedir (SCRIPTDIR); foreach $dir (@dirs) { @@ -124,7 +124,7 @@ sub toplevel || &error ("Couldn't mkdir $workpath/$dir: $!\n"); opendir (SCRIPTDIR, "$scriptpath/$dir") || &error ("Couldn't opendir $scriptpath/$dir: $!\n"); - @files = readdir (SCRIPTDIR); + @files = grep (!/^(\.\.?|CVS|RCS)$/, readdir (SCRIPTDIR) ); closedir (SCRIPTDIR); foreach $test (@files) { @@ -777,7 +777,7 @@ sub remove_directory_tree_inner $subdirhandle++; while ($object = readdir ($dirhandle)) { - if ($object eq "." || $object eq "..") + if ($object =~ /^(\.\.?|CVS|RCS)$/) { next; } @@ -912,7 +912,7 @@ sub compare_dir_tree local (@allfiles); opendir (DIR, $basedir) || &error ("Couldn't open $basedir: $!\n", 1); - @allfiles = grep (!/^\.\.?$/, readdir (DIR) ); + @allfiles = grep (!/^(\.\.?|CVS|RCS)$/, readdir (DIR) ); closedir (DIR); if ($debug) { @@ -955,7 +955,7 @@ sub compare_dir_tree { @files = readdir (DIR); closedir (DIR); - @files = grep (!/^\.\.?$/ && ($_ = "$path/$_"), @files); + @files = grep (!/^(\.\.?|CVS|RCS)$/ && ($_ = "$path/$_"), @files); push (@allfiles, @files); if ($debug) { |