Changeset 933


Ignore:
Timestamp:
Dec 3, 2009, 3:53:30 AM (11 years ago)
Author:
Peter Johansson
Message:

fixes #415

Location:
branches/0.7-stable
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/0.7-stable/configure.ac

    r862 r933  
    186186     )
    187187AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh])
     188AC_CONFIG_FILES([test/copyright_test2.sh], [chmod +x test/copyright_test2.sh])
    188189AC_CONFIG_FILES([test/svn_update.sh], [chmod +x test/svn_update.sh])
    189190AC_CONFIG_FILES([test/check_repo_status.sh],
  • branches/0.7-stable/lib/File.cc

    r847 r933  
    8282        ++rev_iter;
    8383      }
     84      // do not go beyond BASE rev of file
     85      last_rev_this_year = std::min(last_rev_this_year, last_changed_rev());
     86      last_rev_last_year = std::min(last_rev_last_year, last_changed_rev());
    8487      // loop over authors
    8588      for (std::set<std::string>::const_iterator a_iter=stats.authors().begin();
  • branches/0.7-stable/test/Makefile.am

    r847 r933  
    2828
    2929TESTS = $(check_PROGRAMS) test_repo.sh check_repo_status.sh
     30TESTS+= copyright_test2.sh
    3031
    3132# tests not yet passing are listed here
     
    6263
    6364mostlyclean-local:
    64   rm -f *.png *.tmp *~
     65  rm -f *.png *.tmp *~ .toy_project2
  • branches/0.7-stable/test/copyright_test2.sh.in

    r932 r933  
    2424abs_top_builddir=@abs_top_builddir@
    2525abs_builddir=@abs_builddir@
    26 rootdir=$abs_builddir/toy_project
    27 targetdir=$abs_builddir/generated_output
     26# this test has its own wc since it modifies wc
     27rootdir=$abs_builddir/.toy_project2
     28repo="@abs_test_repo@";
    2829
    2930test_repo_found=@test_repo_found@
     
    4546fi
    4647
    47 cd $abs_builddir && @SHELL@ svn_update.sh || exit 1;
     48# exit if cmd fails
     49set -e
    4850
    49 @MKDIR_P@ $targetdir;
     51rm -rf $rootdir
     52svn co file://$repo/trunk $rootdir -r 45
     53svn update $rootdir/lib
     54# cannot use old config file because it's invalid
     55svn update $rootdir/.svndigest
    5056
    51 $abs_top_builddir/bin/svndigest -r $rootdir -t $targetdir \
    52 --ignore-cache --no-report --verbose;
     57$abs_top_builddir/bin/svndigest -r $rootdir --copyright \
     58--ignore-cache --no-report --verbose 
    5359
    54 $abs_top_builddir/bin/svndigest -r $rootdir -t $targetdir -vf;
     60# remove wc to avoid someone being tempted to modify it
     61rm -rf $rootdir
Note: See TracChangeset for help on using the changeset viewer.