From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Thu, 20 Apr 2006 15:34:25 +0000 (+0000)
Subject: Skip CVS directory when scanning numbered script directories in test
X-Git-Tag: exim-4_62~7
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/9e146c9f623bfaaf104450e7be8ab78e042c7c9d?ds=sidebyside

Skip CVS directory when scanning numbered script directories in test
suite runtest script.
---

diff --git a/test/runtest b/test/runtest
index 2e0c72417..d6b3fac7f 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# $Cambridge: exim/test/runtest,v 1.7 2006/04/20 14:11:29 ph10 Exp $
+# $Cambridge: exim/test/runtest,v 1.8 2006/04/20 15:34:25 ph10 Exp $
 
 ###############################################################################
 # This is the controlling script for the "new" test suite for Exim. It should #
@@ -2558,12 +2558,25 @@ opendir(DIR, "scripts") || tests_exit(-1, "Failed to opendir(\"scripts\"): $!");
 @test_dirs = sort readdir(DIR);
 closedir(DIR);
 
+# Remove . and .. and CVS from the list.
+
+for ($i = 0; $i < @test_dirs; $i++)
+  {
+  my($d) = $test_dirs[$i];
+  if ($d eq "." || $d eq ".." || $d eq "CVS")
+    {
+    splice @test_dirs, $i, 1;
+    $i--;
+    }
+  }
+
+# Scan for relevant tests
+
 for ($i = 0; $i < @test_dirs; $i++)
   {
   my($testdir) = $test_dirs[$i];
   my($wantthis) = 1;
 
-  next if $testdir eq "." || $testdir eq "..";
   print ">>Checking $testdir\n" if $debug;
 
   # Skip this directory if the first test is equal or greater than the first