tests/aux/common.sh: Copy test package files to build directory

13 files changed, 17 insertions, 14 deletions

diff --git a/tests/aux/common.sh b/tests/aux/common.sh
index fadf791..13e0737 100644
--- a/tests/aux/common.sh
+++ b/tests/aux/common.sh
@@ -103,6 +103,9 @@ export OPK_HOST_ARCH_LIBS='glibc'
 export OPK_HOST_PLAT='x60'
 # Section 7.3.3 Toolchain Variables aren't used by opkbuild utilities.
 
-rm -Rf "${TOP_BUILDDIR}/tests/pkg/tmp/"
-mkdir -p "${TOP_BUILDDIR}/tests/pkg/tmp/"
-cd "${TOP_BUILDDIR}/tests/pkg/tmp/"
+# For out-of-tree builds, copy test package files to build directory.
+rm -Rf "${TOP_BUILDDIR}/tests/data.build/"
+cp -Rp "${TOP_SRCDIR}/tests/data/" "${TOP_BUILDDIR}/tests/data.build/"
+chmod -R u+w "${TOP_BUILDDIR}/tests/data.build/"  # Automake makes files RO
+mkdir -p "${TOP_BUILDDIR}/tests/data.build/pkg/tmp/"
+cd "${TOP_BUILDDIR}/tests/data.build/pkg/tmp/"
diff --git a/tests/pkg/README b/tests/data/pkg/README
index 4e8791e..4e8791e 100644
--- a/tests/pkg/README
+++ b/tests/data/pkg/README
diff --git a/tests/pkg/bar.pkg/control b/tests/data/pkg/bar.pkg/control
index b0c05fa..b0c05fa 100644
--- a/tests/pkg/bar.pkg/control
+++ b/tests/data/pkg/bar.pkg/control
diff --git a/tests/pkg/changelog b/tests/data/pkg/changelog
index 118a036..118a036 100644
--- a/tests/pkg/changelog
+++ b/tests/data/pkg/changelog
diff --git a/tests/pkg/control b/tests/data/pkg/control
index 6d12994..6d12994 100644
--- a/tests/pkg/control
+++ b/tests/data/pkg/control
diff --git a/tests/pkg/copyright b/tests/data/pkg/copyright
index b4d4b40..b4d4b40 100644
--- a/tests/pkg/copyright
+++ b/tests/data/pkg/copyright
diff --git a/tests/pkg/foo.pkg/control b/tests/data/pkg/foo.pkg/control
index 1ab7dd1..1ab7dd1 100644
--- a/tests/pkg/foo.pkg/control
+++ b/tests/data/pkg/foo.pkg/control
diff --git a/tests/pkg/foo.pkg/docs b/tests/data/pkg/foo.pkg/docs
index ab59324..ab59324 100644
--- a/tests/pkg/foo.pkg/docs
+++ b/tests/data/pkg/foo.pkg/docs
diff --git a/tests/pkg/format b/tests/data/pkg/format
index cd5ac03..cd5ac03 100644
--- a/tests/pkg/format
+++ b/tests/data/pkg/format
diff --git a/tests/pkg/patches/01_goodbye.patch b/tests/data/pkg/patches/01_goodbye.patch
index e30f1c4..e30f1c4 100644
--- a/tests/pkg/patches/01_goodbye.patch
+++ b/tests/data/pkg/patches/01_goodbye.patch
diff --git a/tests/pkg/substvars b/tests/data/pkg/substvars
index fbcb606..fbcb606 100644
--- a/tests/pkg/substvars
+++ b/tests/data/pkg/substvars
diff --git a/tests/src/src/foo.sh b/tests/data/src/src/foo.sh
index aedab81..aedab81 100644
--- a/tests/src/src/foo.sh
+++ b/tests/data/src/src/foo.sh
diff --git a/tests/local.mk b/tests/local.mk
index 8aa5755..c8bbee6 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -30,14 +30,14 @@ EXTRA_DIST += \
 	build-aux/tap-driver.sh \
 	tests/aux/tap-functions.sh \
 	tests/aux/common.sh \
-	tests/pkg/README \
-	tests/pkg/bar.pkg/control \
-	tests/pkg/changelog \
-	tests/pkg/control \
-	tests/pkg/copyright \
-	tests/pkg/foo.pkg/control \
-	tests/pkg/foo.pkg/docs \
-	tests/pkg/format \
-	tests/pkg/patches/01_goodbye.patch \
-	tests/pkg/substvars \
-	tests/src/src/foo.sh
+	tests/data/pkg/README \
+	tests/data/pkg/bar.pkg/control \
+	tests/data/pkg/changelog \
+	tests/data/pkg/control \
+	tests/data/pkg/copyright \
+	tests/data/pkg/foo.pkg/control \
+	tests/data/pkg/foo.pkg/docs \
+	tests/data/pkg/format \
+	tests/data/pkg/patches/01_goodbye.patch \
+	tests/data/pkg/substvars \
+	tests/data/src/src/foo.sh