Changeset 1266

Timestamp:

Nov 2, 2010, 4:39:22 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #484, and shaped test copyright2_test.sh to test for this. Also changed name of test to option.test to avoid conflict between object files on case insensitive file systems.

Location:

trunk

Files:

• lib/Directory.cc (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/copyright2_test.sh (modified) (2 diffs)
• test/option.cc (moved) (moved from trunk/test/parameter.cc) (2 diffs)

trunk/lib/Directory.cc

@@ -274 +274 @@
   void Directory::traverse(NodeVisitor& visitor)
   {
-    visitor.enter(*this);
-    for (NodeIterator first=daughters_.begin(), end=daughters_.end();
-         first!=end; ++first)
-      (*first)->traverse(visitor);
+    if (visitor.enter(*this))
+      for (NodeIterator first=daughters_.begin(), end=daughters_.end();
+           first!=end; ++first)
+        (*first)->traverse(visitor);
     visitor.leave(*this);
   }

trunk/test/Makefile.am

@@ -28 +28 @@
 EXTRA_PROGRAMS = cache_partial.test color.test \
   config.test copyright.test date.test \
-  graph.test htmlstream.test parameter.test \
-  parser.test stats.test svn_diff.test trac.test utility.test \
+  graph.test htmlstream.test \
+  parser.test option.test stats.test svn_diff.test trac.test utility.test \
   vector.test
 
 CLEANFILES = $(EXTRA_PROGRAMS)
 
-parameter_test_SOURCES = parameter_test.cc $(top_srcdir)/bin/Parameter.cc \
+option_test_SOURCES = option.cc $(top_srcdir)/bin/Parameter.cc \
   $(top_srcdir)/bin/svndigestParameter.cc
 

trunk/test/copyright2_test.sh

@@ -28 +28 @@
 set -e
 
-rm -rf $rootdir
+$SVN revert $rootdir -R
 $SVN update $rootdir -r 45
 $SVN update $rootdir/lib
@@ -34 +34 @@
 $SVN update $rootdir/.svndigest
 
-SVNCOPYRIGHT_run 1 -r $rootdir --ignore-cache 
+SVNCOPYRIGHT_run 0 -r $rootdir --ignore-cache --verbose
+rm -rf $rootdir
+
+$GREP '^Parsing.*dir_to_be_ignored' stdout && exit_fail
 
 exit_success;

trunk/test/option.cc

@@ -54 +54 @@
 {
   suite.out() << "test --root ROOT\n";
-  test_root(suite, ".", test::abs_builddir()+"/testSubDir/parameter_test",
-            "parameter_test");
+  test_root(suite, ".", test::abs_builddir()+"/testSubDir/option.test",
+            "option.test");
   test_root(suite, "..", test::abs_builddir()+"/testSubDir","testSubDir");
   test_root(suite, "../..", test::abs_builddir(), "test");
@@ -68 +68 @@
   }
   test_root(suite, "symlink", 
-            test::abs_builddir()+"/testSubDir/parameter_test", "symlink");
+            test::abs_builddir()+"/testSubDir/option.test", "symlink");
   test_root(suite, "symlink/.", 
-            test::abs_builddir()+"/testSubDir/parameter_test","parameter_test");
+            test::abs_builddir()+"/testSubDir/option.test","option.test");
   test_root(suite, "symlink/..", 
             test::abs_builddir()+"/testSubDir", "testSubDir");
-  test_root(suite, test::abs_builddir()+"/testSubDir/parameter_test/symlink/..", 
+  test_root(suite, test::abs_builddir()+"/testSubDir/option.test/symlink/..", 
             test::abs_builddir()+"/testSubDir", "testSubDir");
-  test_root(suite, test::abs_builddir()+"/testSubDir/parameter_test/symlink", 
-            test::abs_builddir()+"/testSubDir/parameter_test", "symlink");
+  test_root(suite, test::abs_builddir()+"/testSubDir/option.test/symlink", 
+            test::abs_builddir()+"/testSubDir/option.test", "symlink");
   
   try {