tests/intree: Make copy and break out from tests/example

We introduce make_copy, which makes a copy of tests/example
suitable for testing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/build-common b/tests/build-common
index 01ed83929ff275ebf4834a45c5bdfa4d44ed2d6c..84f95977cbb920bcbf86c7dcfd478cc60c2546ca 100644 (file)
--- a/tests/build-common
+++ b/tests/build-common
@@ -2,3 +2,12 @@
 SUBDIRMK_REGEN_NDEBUG=''
 export SUBDIRMK_REGEN_NDEBUG
 
 SUBDIRMK_REGEN_NDEBUG=''
 export SUBDIRMK_REGEN_NDEBUG
 

+make_copy () {
+       rm -rf tests/$1/example
+       mkdir tests/$1/example
+       git ls-files -z example \
+       | xargs -0 \
+       sh -xec 'rsync -R -l "$@" tests/'$1'/' x
+       rm tests/$1/example/subdirmk
+       ln -sf ../../.. tests/$1/example/subdirmk
+}

diff --git a/tests/check b/tests/check
index 784fc60a17d9a59435a1be5d8463188e6eb64729..3bd0f89aebd7bc3655687fef028e69ceb35a9bcb 100755 (executable)
--- a/tests/check
+++ b/tests/check
@@ -2,4 +2,5 @@
 set -ex
 
 tests/filter/check
 set -ex
 
 tests/filter/check

+tests/intree/check

 tests/example/check
 tests/example/check

diff --git a/tests/example/check b/tests/example/check
index d492068dfcafa71c5a45024ec5137c8787ef290e..003bf81495896c2d91df9ee6367148917120a092 100755 (executable)
--- a/tests/example/check
+++ b/tests/example/check
@@ -5,14 +5,6 @@ set -ex
 
 cd example
 
 
 cd example
 

-: ----- in-tree build -----
-
-git clean -xdff
-./autogen.sh && ./configure
-make -j4 all check
-make -j4 clean
-make -j4 all check
-

 : ----- out of tree build -----
 
 git clean -xdff
 : ----- out of tree build -----
 
 git clean -xdff

diff --git a/tests/intree/.gitignore b/tests/intree/.gitignore
new file mode 100644 (file)
index 0000000..33a9488
--- /dev/null
+++ b/tests/intree/.gitignore
@@ -0,0 +1 @@
+example

diff --git a/tests/intree/check b/tests/intree/check
new file mode 100755 (executable)
index 0000000..78725ac
--- /dev/null
+++ b/tests/intree/check
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -ex
+
+. tests/build-common
+
+make_copy intree
+
+cd tests/intree/example
+
+./autogen.sh && ./configure
+make -j4 all check
+make -j4 clean
+make -j4 all check
+
+echo ok.