Re: [PATCH 1/7] nitsi: Create "nitsi" Makefile target

Re: [PATCH 1/7] nitsi: Create "nitsi" Makefile target

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2159 bytes --]

Please send text-only emails. The HTML part messes up patchwork.

Best,
-Michael

On Thu, 2018-06-14 at 13:44 +0200, Jonatan Schlag wrote:
> Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> 
> Am Mo, 4. Jun, 2018 um 5:38 schrieb Michael Tremer <michael.tremer(a)ipfire.org>
> :
> > Calling "make nitsi" will run all nitsi tests
> > 
> > Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> > ---
> >  Makefile.am  | 22 ++++++++++++++++++++++
> >  configure.ac |  1 +
> >  2 files changed, 23 insertions(+)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index 7a755cc264a1..c02376462cf4 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \
> >  
> >  # -----------------------------------------------------------------------
> > -------
> >  
> > +AM_V_NITSI   = $(AM_V_NITSI_$(V))
> > +AM_V_NITSI_  = $(AM_V_NITSI_$(AM_DEFAULT_VERBOSITY))
> > +AM_V_NITSI_0 = @echo "  NITSI   " $@;
> > +
> >  AM_V_XSLT   = $(AM_V_XSLT_$(V))
> >  AM_V_XSLT_  = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
> >  AM_V_XSLT_0 = @echo "  XSLT    " $@;
> > @@ -543,3 +547,21 @@ TESTS = \
> >  	test/functions/ip/ip_prefix_is_valid \
> >  	test/functions/ip/ip_protocol_is_supported \
> >  	test/functions/ip/ip_split_prefix
> > +
> > +# - NITSI tests ---------------------------------------------------------
> > -------
> > +
> > +NITSI_TESTS = \
> > +	test/nitsi/test/hello-world
> > +
> > +EXTRA_DIST += \
> > +	test/nitsi/test/hello-world/recipe \
> > +	test/nitsi/test/hello-world/settings
> > +
> > +NITSI_ENVIRONMENT =
> > +
> > +.PHONY: $(NITSI_TESTS)
> > +$(NITSI_TESTS):
> > +	$(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@
> > +
> > +.PHONY: nitsi
> > +nitsi: $(NITSI_TESTS)
> > diff --git a/configure.ac b/configure.ac
> > index 7cb5ef1110fa..515941451aba 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -50,6 +50,7 @@ AC_PROG_LN_S
> >  AC_PROG_MKDIR_P
> >  AC_PROG_SED
> >  
> > +AC_PATH_PROG([NITSI], [nitsi])
> >  AC_PATH_PROG([XSLTPROC], [xsltproc])
> >  
> >  # pkg-config
> > -- 
> > 2.17.0
> > 

[PATCH 1/7] nitsi: Create "nitsi" Makefile target

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]

Calling "make nitsi" will run all nitsi tests

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 Makefile.am  | 22 ++++++++++++++++++++++
 configure.ac |  1 +
 2 files changed, 23 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 7a755cc264a1..c02376462cf4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \
 
 # ------------------------------------------------------------------------------
 
+AM_V_NITSI   = $(AM_V_NITSI_$(V))
+AM_V_NITSI_  = $(AM_V_NITSI_$(AM_DEFAULT_VERBOSITY))
+AM_V_NITSI_0 = @echo "  NITSI   " $@;
+
 AM_V_XSLT   = $(AM_V_XSLT_$(V))
 AM_V_XSLT_  = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
 AM_V_XSLT_0 = @echo "  XSLT    " $@;
@@ -543,3 +547,21 @@ TESTS = \
 	test/functions/ip/ip_prefix_is_valid \
 	test/functions/ip/ip_protocol_is_supported \
 	test/functions/ip/ip_split_prefix
+
+# - NITSI tests ----------------------------------------------------------------
+
+NITSI_TESTS = \
+	test/nitsi/test/hello-world
+
+EXTRA_DIST += \
+	test/nitsi/test/hello-world/recipe \
+	test/nitsi/test/hello-world/settings
+
+NITSI_ENVIRONMENT =
+
+.PHONY: $(NITSI_TESTS)
+$(NITSI_TESTS):
+	$(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@
+
+.PHONY: nitsi
+nitsi: $(NITSI_TESTS)
diff --git a/configure.ac b/configure.ac
index 7cb5ef1110fa..515941451aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ AC_PROG_LN_S
 AC_PROG_MKDIR_P
 AC_PROG_SED
 
+AC_PATH_PROG([NITSI], [nitsi])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 # pkg-config
-- 
2.17.0