From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 4/7] nitsi: Add a test that calls "make check" in the virtual
 environment
Date: Mon, 04 Jun 2018 16:38:29 +0100
Message-ID: <20180604153832.331239-4-michael.tremer@ipfire.org>
In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7621453970927305008=="
List-Id: <network.lists.ipfire.org>

--===============7621453970927305008==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 Makefile.am                            | 16 ++++++++++++----
 test/nitsi/test/make-check/.gitignore  |  2 ++
 test/nitsi/test/make-check/recipe.in   |  3 +++
 test/nitsi/test/make-check/settings.in | 12 ++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 test/nitsi/test/make-check/.gitignore
 create mode 100644 test/nitsi/test/make-check/recipe.in
 create mode 100644 test/nitsi/test/make-check/settings.in

diff --git a/Makefile.am b/Makefile.am
index 73c79f501f99..a0d57689d97e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -490,6 +490,7 @@ substitutions =3D \
 	'|PACKAGE_NAME=3D$(PACKAGE_NAME)|' \
 	'|PACKAGE_URL=3D$(PACKAGE_URL)|' \
 	'|PACKAGE_VERSION=3D$(PACKAGE_VERSION)|' \
+	'|builddir=3D$(abs_builddir)|' \
 	'|prefix=3D$(prefix)|' \
 	'|exec_prefix=3D$(exec_prefix)|' \
 	'|sbindir=3D$(sbindir)|' \
@@ -542,17 +543,24 @@ TESTS =3D \
 # - NITSI tests ------------------------------------------------------------=
----
=20
 NITSI_TESTS =3D \
-	test/nitsi/test/hello-world
+	test/nitsi/test/hello-world \
+	test/nitsi/test/make-check
=20
 EXTRA_DIST +=3D \
 	test/nitsi/test/hello-world/recipe \
-	test/nitsi/test/hello-world/settings
+	test/nitsi/test/hello-world/settings \
+	test/nitsi/test/make-check/recipe.in \
+	test/nitsi/test/make-check/settings.in
+
+CLEANFILES +=3D \
+	test/nitsi/test/make-check/recipe \
+	test/nitsi/test/make-check/settings
=20
 NITSI_ENVIRONMENT =3D
=20
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): dist
+$(NITSI_TESTS): % : %/recipe %/settings
 	$(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@
=20
 .PHONY: nitsi
-nitsi: $(NITSI_TESTS)
+nitsi: dist $(NITSI_TESTS)
diff --git a/test/nitsi/test/make-check/.gitignore b/test/nitsi/test/make-che=
ck/.gitignore
new file mode 100644
index 000000000000..5fd84c8fa188
--- /dev/null
+++ b/test/nitsi/test/make-check/.gitignore
@@ -0,0 +1,2 @@
+/recipe
+/settings
diff --git a/test/nitsi/test/make-check/recipe.in b/test/nitsi/test/make-chec=
k/recipe.in
new file mode 100644
index 000000000000..13d664b8db9a
--- /dev/null
+++ b/test/nitsi/test/make-check/recipe.in
@@ -0,0 +1,3 @@
+alice: tar xvfa @PACKAGE_NAME(a)-@PACKAGE_VERSION(a).tar.gz && cd @PACKAGE_N=
AME(a)-@PACKAGE_VERSION@
+alice: ./configure --prefix=3D/usr && make -j2
+alice: make check
diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-ch=
eck/settings.in
new file mode 100644
index 000000000000..cac865de8bad
--- /dev/null
+++ b/test/nitsi/test/make-check/settings.in
@@ -0,0 +1,12 @@
+[DEFAULT]
+Name =3D make check
+Description =3D This test runs make install in the virtual environment
+	to determine if the source tarball is complete and module test
+	can be executed in the virtual environment
+
+Copy_from =3D ../../../../@PACKAGE_NAME(a)-@PACKAGE_VERSION(a).tar.gz
+Copy_to =3D /root/
+
+[VIRTUAL_ENVIRONMENT]
+Name =3D basic
+path =3D ../../virtual-environment/basic
--=20
2.17.0


--===============7621453970927305008==--