X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tests%2Fexample%2Fcheck;h=d7fff17321f954bd4d204b268b5982a885c6b580;hb=62ddb6b1bd58afe028dfe8799aa86bc9bd4b1a48;hp=143fe05dfe370b84398cbaad68f4488557570c8d;hpb=3ce4fab1bb4c299cdf639dcb36b4a29079705925;p=subdirmk.git

diff --git a/tests/example/check b/tests/example/check
index 143fe05..d7fff17 100755
--- a/tests/example/check
+++ b/tests/example/check
@@ -1,42 +1,43 @@
 #!/bin/sh
 set -ex
 
-cd example
+. tests/build-common
 
-SUBDIRMK_REGEN_NDEBUG=''
-export SUBDIRMK_REGEN_NDEBUG
+make_copy example
 
-: ----- in-tree build -----
-
-git clean -xdff
-./autogen.sh && ./configure
-make -j4 all check
-make -j4 clean
-make -j4 all check
+cd tests/example/example
 
 : ----- out of tree build -----
 
-git clean -xdff
 mkdir build
 cd build
 >>../src/for-test.sd.mk
 >>../lib/for-test.mk.in
+>>../for-test-final.sd.mk
 .././autogen.sh && ../configure
 make -j4 all check
 
 : ----- testing rebuild on input change -----
 
 reset_times () {
+	cd ..
+
+	find ! -path './build/*' -type f -print0 \
+	| xargs -0 \
+	touch -hmd 'now -2000 seconds' --
+
+	cd build
+
 	find -type f -print0 \
 	| xargs -0 \
-	touch -hmd 'now -1 seconds' --
+	touch -hmd 'now -1000 seconds' --
 }
 
 : ----- for-check-1 -----
 reset_times
 echo 'for-check-1:' >>../src/for-test.sd.mk
 make -j4 for-check-1
-grep '^for-check-1:' src/Subdir.mk || false
+grep '^for-check-1:' src/Dir.mk || false
 
 : ----- for-check-2 -----
 reset_times
@@ -44,4 +45,10 @@ echo 'for-check-2:' >>../lib/for-test.mk.in
 make -j4 for-check-2
 grep '^for-check-2:' lib/for-test.mk || false
 
+: ----- for-check-3 -----
+reset_times
+echo 'for-check-3:' >>../for-test-final.sd.mk
+make -j4 for-check-3
+grep '^for-check-3:' Final.mk
+
 echo ok.