Add include dir for nitsi test

When we include recipes in our recipe we must be shure in some cases
that the recipe are generated out of a .in file.

All files in the include dir will be generated before every test so we
can be shure that these files are present.

This is useful for recipes like the make-install recipe in this test,
which needs to be generated and will be included in nearly every test.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index b976da661c50475f15b82bcf92a2c7c0a5ea79e3..e56d0fb1db6f2bfa3aa465a4b9a36313861a3284 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -585,6 +585,15 @@ VIRTUAL_ENVIRONMENT_IMAGES_DIR = $(abs_builddir)/test/nitsi/virtual-environment/
 VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
        https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
 
+NITSI_INCLUDE_RECIPES = \
+       test/nitsi/include/make-install
+
+EXTRA_DIST += \
+       test/nitsi/include/make-install.in
+
+CLEANFILES += \
+       test/nitsi/include/make-install
+
 NITSI_TESTS = \
        test/nitsi/test/hello-world \
        test/nitsi/test/make-check
@@ -602,7 +611,7 @@ CLEANFILES += \
 NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES)
+$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
        $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@
 
 .PHONY: nitsi

diff --git a/test/nitsi/include/make-install.in b/test/nitsi/include/make-install.in
new file mode 100644 (file)
index 0000000..581c02d
--- /dev/null
+++ b/test/nitsi/include/make-install.in
@@ -0,0 +1,4 @@
+all: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@
+all: ./configure --prefix=/usr && make -j2
+all: make
+all: make install