From patchwork Tue Jun 5 01:38:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1798 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 9E4FB60C06 for ; Mon, 4 Jun 2018 17:38:41 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 79E9F10D19E3; Mon, 4 Jun 2018 16:38:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126721; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=5ZucBLeWNNbxN7+H4FoDY4n7UUA51hPt5YBXOVktqiM=; b=CyQGOc6QP3ThLusyWLtT2G9id49jLDjXsPoCkCtTfR/jYu+6dDbIyY2vsimcARraKCmfyy PG1cVPuFoYG1RgGyGfp3GxTd3HOOlQBdJuKIYROxNC475ZUEEhTV+6HUqkgrJ/f7WoS855 SmlAopkUdS3iFXoBGv6v3glOHn6kdXLSJaZ4Efm2dmrea2iZHpxxUA0dmhb1frDFqxHIXw IbthhqizJ2DBEepdaO5+m4hYD93+93CJ/i0sF1EQJ5NGRZaNTrL99+1Y8U386qFZY2Lv3N 8kQrv1wxOPbcYwSvY9nZS2W8KyY3hOq6SIzQUqSIsmJxxWufd5vLQeLXGX7a9Q== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126719; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=5ZucBLeWNNbxN7+H4FoDY4n7UUA51hPt5YBXOVktqiM=; b=BBKmFTQDFXfyCDRrcpKhl+MWWhQaPada365L52t/cutdVxorYTODj9dUiWv7LuyDdyGZ2B RrhTu6FDELsaxJI7JCwdLzfKWpNVrUyzQWEoQId+9qEFKd1+/PQfm2PM/dA3KMNLt608r1 D9qXWQIuVGfqkY9XNGuzzvvL48/XQudAlyDK7IKSxu74ebRn31VjMWdKYYJkpUVhkRhX8a Jn9PbIYWyqWoKH6GMWZj80eVd8w+DMPg72Or7iMBud/pRYNEzje4vgAG2kfKCsBID7uvxM inE1JQcqswFqjiWcQecTu3VFBdhBDkJNVvzJmtNu4ow45dgTHMH+RaPpCKH++Q== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 69DB210D19E3; Mon, 4 Jun 2018 16:38:39 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 4/7] nitsi: Add a test that calls "make check" in the virtual environment Date: Mon, 4 Jun 2018 16:38:29 +0100 Message-Id: <20180604153832.331239-4-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.06 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.96)[-0.985,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.06 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List for the network package List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: network-bounces@lists.ipfire.org Sender: "network" Signed-off-by: Michael Tremer --- 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 = \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ + '|builddir=$(abs_builddir)|' \ '|prefix=$(prefix)|' \ '|exec_prefix=$(exec_prefix)|' \ '|sbindir=$(sbindir)|' \ @@ -542,17 +543,24 @@ TESTS = \ # - NITSI tests ---------------------------------------------------------------- NITSI_TESTS = \ - test/nitsi/test/hello-world + test/nitsi/test/hello-world \ + test/nitsi/test/make-check EXTRA_DIST += \ 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 += \ + test/nitsi/test/make-check/recipe \ + test/nitsi/test/make-check/settings NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) -$(NITSI_TESTS): dist +$(NITSI_TESTS): % : %/recipe %/settings $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ .PHONY: nitsi -nitsi: $(NITSI_TESTS) +nitsi: dist $(NITSI_TESTS) diff --git a/test/nitsi/test/make-check/.gitignore b/test/nitsi/test/make-check/.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-check/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@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@ +alice: ./configure --prefix=/usr && make -j2 +alice: make check diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-check/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 = make check +Description = 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 = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz +Copy_to = /root/ + +[VIRTUAL_ENVIRONMENT] +Name = basic +path = ../../virtual-environment/basic