Changeset 1266 for trunk


Ignore:
Timestamp:
Nov 2, 2010, 4:39:22 AM (10 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:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/lib/Directory.cc

    r1264 r1266  
    274274  void Directory::traverse(NodeVisitor& visitor)
    275275  {
    276     visitor.enter(*this);
    277     for (NodeIterator first=daughters_.begin(), end=daughters_.end();
    278         first!=end; ++first)
    279       (*first)->traverse(visitor);
     276    if (visitor.enter(*this))
     277      for (NodeIterator first=daughters_.begin(), end=daughters_.end();
     278          first!=end; ++first)
     279        (*first)->traverse(visitor);
    280280    visitor.leave(*this);
    281281  }
  • trunk/test/Makefile.am

    r1265 r1266  
    2828EXTRA_PROGRAMS = cache_partial.test color.test \
    2929  config.test copyright.test date.test \
    30   graph.test htmlstream.test parameter.test \
    31   parser.test stats.test svn_diff.test trac.test utility.test \
     30  graph.test htmlstream.test \
     31  parser.test option.test stats.test svn_diff.test trac.test utility.test \
    3232  vector.test
    3333
    3434CLEANFILES = $(EXTRA_PROGRAMS)
    3535
    36 parameter_test_SOURCES = parameter_test.cc $(top_srcdir)/bin/Parameter.cc \
     36option_test_SOURCES = option.cc $(top_srcdir)/bin/Parameter.cc \
    3737  $(top_srcdir)/bin/svndigestParameter.cc
    3838
  • trunk/test/copyright2_test.sh

    r1094 r1266  
    2828set -e
    2929
    30 rm -rf $rootdir
     30$SVN revert $rootdir -R
    3131$SVN update $rootdir -r 45
    3232$SVN update $rootdir/lib
     
    3434$SVN update $rootdir/.svndigest
    3535
    36 SVNCOPYRIGHT_run 1 -r $rootdir --ignore-cache
     36SVNCOPYRIGHT_run 0 -r $rootdir --ignore-cache --verbose
     37rm -rf $rootdir
     38
     39$GREP '^Parsing.*dir_to_be_ignored' stdout && exit_fail
    3740
    3841exit_success;
  • trunk/test/option.cc

    r1265 r1266  
    5454{
    5555  suite.out() << "test --root ROOT\n";
    56   test_root(suite, ".", test::abs_builddir()+"/testSubDir/parameter_test",
    57             "parameter_test");
     56  test_root(suite, ".", test::abs_builddir()+"/testSubDir/option.test",
     57            "option.test");
    5858  test_root(suite, "..", test::abs_builddir()+"/testSubDir","testSubDir");
    5959  test_root(suite, "../..", test::abs_builddir(), "test");
     
    6868  }
    6969  test_root(suite, "symlink",
    70             test::abs_builddir()+"/testSubDir/parameter_test", "symlink");
     70            test::abs_builddir()+"/testSubDir/option.test", "symlink");
    7171  test_root(suite, "symlink/.",
    72             test::abs_builddir()+"/testSubDir/parameter_test","parameter_test");
     72            test::abs_builddir()+"/testSubDir/option.test","option.test");
    7373  test_root(suite, "symlink/..",
    7474            test::abs_builddir()+"/testSubDir", "testSubDir");
    75   test_root(suite, test::abs_builddir()+"/testSubDir/parameter_test/symlink/..",
     75  test_root(suite, test::abs_builddir()+"/testSubDir/option.test/symlink/..",
    7676            test::abs_builddir()+"/testSubDir", "testSubDir");
    77   test_root(suite, test::abs_builddir()+"/testSubDir/parameter_test/symlink",
    78             test::abs_builddir()+"/testSubDir/parameter_test", "symlink");
     77  test_root(suite, test::abs_builddir()+"/testSubDir/option.test/symlink",
     78            test::abs_builddir()+"/testSubDir/option.test", "symlink");
    7979 
    8080  try {
Note: See TracChangeset for help on using the changeset viewer.