From 1217fd3b23c147c0e5edc24f05fc4fce424e490b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Dec 2019 12:59:14 +0000
Subject: [PATCH] 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>
---
 tests/build-common      |  9 +++++++++
 tests/check             |  1 +
 tests/example/check     |  8 --------
 tests/intree/.gitignore |  1 +
 tests/intree/check      | 15 +++++++++++++++
 5 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 tests/intree/.gitignore
 create mode 100755 tests/intree/check

diff --git a/tests/build-common b/tests/build-common
index 01ed839..84f9597 100644
--- a/tests/build-common
+++ b/tests/build-common
@@ -2,3 +2,12 @@
 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 784fc60..3bd0f89 100755
--- a/tests/check
+++ b/tests/check
@@ -2,4 +2,5 @@
 set -ex
 
 tests/filter/check
+tests/intree/check
 tests/example/check
diff --git a/tests/example/check b/tests/example/check
index d492068..003bf81 100755
--- a/tests/example/check
+++ b/tests/example/check
@@ -5,14 +5,6 @@ set -ex
 
 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
diff --git a/tests/intree/.gitignore b/tests/intree/.gitignore
new file mode 100644
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
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.
-- 
2.30.2