From 60dbefba989dda042796c91494211992156492c1 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 30 Jun 2018 17:54:04 +0200 Subject: [PATCH] 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 Signed-off-by: Michael Tremer --- Makefile.am | 11 ++++++++++- test/nitsi/include/make-install.in | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/nitsi/include/make-install.in diff --git a/Makefile.am b/Makefile.am index b976da66..e56d0fb1 100644 --- 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 index 00000000..581c02db --- /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 -- 2.39.2