diff mbox series

Add include dir for nitsi test

Message ID 20180630155404.5454-1-jonatan.schlag@ipfire.org
State Accepted
Commit 60dbefba989dda042796c91494211992156492c1
Headers
Series Add include dir for nitsi test |

Commit Message

Jonatan Schlag July 1, 2018, 1:54 a.m. UTC 
  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>
---
 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

Comments

Michael Tremer July 1, 2018, 2:07 a.m. UTC | #1 
What is going to use this?

-Michael

On Sat, 2018-06-30 at 17:54 +0200, Jonatan Schlag wrote:
> 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>
> ---
>  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 b976da6..e56d0fb 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/b
> asic/
>  
> +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 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@-@P
> ACKAGE_VERSION@
> +all: ./configure --prefix=/usr && make -j2
> +all: make
> +all: make install
Michael Tremer July 1, 2018, 2:09 a.m. UTC | #2 
Cool! :)

Please don't forget to CC the list.

On Sat, 2018-06-30 at 18:08 +0200, Jonatan Schlag wrote:
> Hi,
> 
> The next test which I will post hopefully later this evening.
> 
> Jonatan
> 
> Am Sa, 30. Jun, 2018 um 6:07 schrieb Michael Tremer 
> <michael.tremer@ipfire.org>:
> > What is going to use this?
> > 
> > -Michael
> > 
> > On Sat, 2018-06-30 at 17:54 +0200, Jonatan Schlag wrote:
> > >  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>
> > >  ---
> > >   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 b976da6..e56d0fb 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/b
> > >  asic/
> > > 
> > >  +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 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@-@P
> > >  ACKAGE_VERSION@
> > >  +all: ./configure --prefix=/usr && make -j2
> > >  +all: make
> > >  +all: make install
> 
>
diff mbox series

Patch

diff --git a/Makefile.am b/Makefile.am
index b976da6..e56d0fb 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 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