[Monotone-commits-diffs] net.venge.monotone: 44475d3c6b2db320f245f8d4f25c05173d5562d9

[code]

revision:            44475d3c6b2db320f245f8d4f25c05173d5562d9
date:                2011-02-05T20:01:38
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
* contrib/dump-test-logs.sh: Renamed to...
* extra/building/dump-test-logs.sh.in: ...this.  The reason for this is
  that there's at least one builder that actually uses it (Debian).
* Makefile.am (noinst_SCRIPTS): Add extra/building/dump-test-logs.sh.  It
  doesn't need being installed.
  (extra/building/dump-test-logs.sh): New target to build it.

manifest:
format_version "1"

new_manifest [1ee9f192756020c195be95b31a872d6894459086]

old_revision [4bc978dc3ef8ad2e1788ba9cc5bf737e52f48dbd]

rename "contrib/dump-test-logs.sh"
    to "extra/building/dump-test-logs.sh.in"

add_dir "extra/building"

patch "Makefile.am"
 from [1cc31204ed418015be7a5414bc899ad5970c76f1]
   to [08db0dd6c5b50db025cb9aea4a8889e8530b41a3]

patch "extra/building/dump-test-logs.sh.in"
 from [4704860e558cd008279f58ba7ccd11b2a0789895]
   to [a11744bbc3dfe9acf2678b5d3e846ced85629f44]
============================================================
--- Makefile.am	1cc31204ed418015be7a5414bc899ad5970c76f1
+++ Makefile.am	08db0dd6c5b50db025cb9aea4a8889e8530b41a3
@@ -222,6 +222,7 @@ bin_SCRIPTS = mtnopt
 EXTRA_PROGRAMS =
 
 bin_SCRIPTS = mtnopt
+noinst_SCRIPTS = extra/building/dump-test-logs.sh
 
 mtn_SOURCES = $(MOST_SOURCES) src/monotone.cc
 nodist_mtn_SOURCES = src/std_hooks.cc src/schema.cc
@@ -638,7 +639,7 @@ do_subst = sed -e 's,address@hidden
 do_subst = sed -e 's,address@hidden@],$(PACKAGE_VERSION),' \
 	-e 's,address@hidden@],$(sysconfdir),'
 
-%: src/util/%.in
+%: src/util/%.in Makefile
 	$(V_subst)$(do_subst) < $< > $@ && chmod +x $@
 
 extra/shell/monotone.bash_completion: extra/shell/monotone.bash_completion.in \
@@ -650,6 +651,10 @@ extra/shell/monotone.bash_completion: ex
 	  sed -e '1,/address@hidden@]$$/d' < $< ) | \
 	  $(do_subst) > $@
 
+extra/building/dump-test-logs.sh: extra/building/dump-test-logs.sh.in Makefile
+	$(MKDIR_P) extra/building
+	$(V_subst)$(do_subst) < $< > $@ && chmod +x $@
+
 # This is phony, so that we always try to rebuild it.  If it succeeds
 # in calculating changes, it produces its target; otherwise, its
 # target does not exist.
============================================================
--- contrib/dump-test-logs.sh	4704860e558cd008279f58ba7ccd11b2a0789895
+++ extra/building/dump-test-logs.sh.in	a11744bbc3dfe9acf2678b5d3e846ced85629f44
@@ -9,8 +9,11 @@
 
 # Conveniently enough, testlib.lua does most of the work for us.
 
-for log in tester_dir/*.log
+testsuites="tester unit func extra"
+
+for test in $testsuites
 do
+    log=test/work/$test.log
     if grep "0 failed" < $log > /dev/null 2>&1 &&
        grep "0 succeeded unexpectedly" < $log > /dev/null 2>&1
     then :