Changeset 933 for branches

Timestamp:

Dec 3, 2009, 3:53:30 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #415

Location:

branches/0.7-stable

Files:

• configure.ac (modified) (1 diff)
• lib/File.cc (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/copyright_test2.sh.in (copied) (copied from branches/0.7-stable/test/test_repo.sh.in) (2 diffs)

branches/0.7-stable/configure.ac

@@ -186 +186 @@
      )
 AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh])
+AC_CONFIG_FILES([test/copyright_test2.sh], [chmod +x test/copyright_test2.sh])
 AC_CONFIG_FILES([test/svn_update.sh], [chmod +x test/svn_update.sh])
 AC_CONFIG_FILES([test/check_repo_status.sh], 

branches/0.7-stable/lib/File.cc

@@ -82 +82 @@
         ++rev_iter;
       }
+      // do not go beyond BASE rev of file
+      last_rev_this_year = std::min(last_rev_this_year, last_changed_rev());
+      last_rev_last_year = std::min(last_rev_last_year, last_changed_rev());
       // loop over authors
       for (std::set<std::string>::const_iterator a_iter=stats.authors().begin();

branches/0.7-stable/test/Makefile.am

@@ -28 +28 @@
 
 TESTS = $(check_PROGRAMS) test_repo.sh check_repo_status.sh
+TESTS+= copyright_test2.sh
 
 # tests not yet passing are listed here
@@ -62 +63 @@
 
 mostlyclean-local: 
-  rm -f *.png *.tmp *~
+  rm -f *.png *.tmp *~ .toy_project2

branches/0.7-stable/test/copyright_test2.sh.in

@@ -24 +24 @@
 abs_top_builddir=@abs_top_builddir@
 abs_builddir=@abs_builddir@
-rootdir=$abs_builddir/toy_project
-targetdir=$abs_builddir/generated_output
+# this test has its own wc since it modifies wc
+rootdir=$abs_builddir/.toy_project2
+repo="@abs_test_repo@";
 
 test_repo_found=@test_repo_found@
@@ -45 +46 @@
 fi
 
-cd $abs_builddir && @SHELL@ svn_update.sh || exit 1;
+# exit if cmd fails
+set -e
 
-@MKDIR_P@ $targetdir;
+rm -rf $rootdir
+svn co file://$repo/trunk $rootdir -r 45
+svn update $rootdir/lib
+# cannot use old config file because it's invalid
+svn update $rootdir/.svndigest
 
-$abs_top_builddir/bin/svndigest -r $rootdir -t $targetdir \
---ignore-cache --no-report --verbose;
+$abs_top_builddir/bin/svndigest -r $rootdir --copyright \
+--ignore-cache --no-report --verbose 
 
-$abs_top_builddir/bin/svndigest -r $rootdir -t $targetdir -vf;
+# remove wc to avoid someone being tempted to modify it
+rm -rf $rootdir