From patchwork Sun Jul 1 01:54:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1855 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 07AFD6095C for ; Sat, 30 Jun 2018 17:54:09 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id AE96E10910C5; Sat, 30 Jun 2018 16:54:08 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1530374048; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=hlYUeaT4TW3rVxGJDMMNuTaqWmfp+SkZbsMUyTd2ZDg=; b=lh48t5CCHN/nV8ai1YZzx8HRrvU3uLJ4H+iIrcSK2HJJfv3itC/+YnyOdBf1pcFrSXg1TG KlRBoRJjQVSIWXU9v7gZHGdX6hwo50kqq9kLTKzoOT1SnvVz/A2Ud5DIPud2tBHngtw6tD 3dto/HgpH8KcB5BR6G4YmBroqfg63h9DwOYGain//yLl82+WTmQGP6xMCFabDdZS60bfoR PJ/nNH+yIZDsq48roZCIcz18IadOoc/+HL2Kkor8CBuq46LU08smGZUXmJc3kosuJz2zut 8MKpr+3x57yCwaY/xytvTm04CtM8z0KFMn+syWj4SJDoV8/FdRV+SO4pNPyHjg== Received: from bockland.local.familyschlag (unknown [46.183.103.17]) (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 D79B0106CE84; Sat, 30 Jun 2018 16:54:06 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1530374047; 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:references; bh=hlYUeaT4TW3rVxGJDMMNuTaqWmfp+SkZbsMUyTd2ZDg=; b=n6YqgOJdTXjCBW3BsAA248Y2RL/oxfunKIKpp5UL+BTrM4PSCDhmeMQVryqs5Z8yzj1JdT aNVmmgsiizirB6HJiaDRE6fuJTQ+VbLhtNhAK3l5KKPHgL7Z6t5+60l+0BjlPhpe0AIR/o FpXVCorv+WID8KJy4FjQSf+jfOTOMRFSd3WFSvitnoSoJSxr2qum/hoQhXJ66I1Z0v9fdn CyeZH51jwykGHZkkNDt5YrZZbXqTAXa4A9ychxqiYuZDJcDyyGiaIkHm/folv03QdayBsO k5BkEiqJOL3FBBUrWyP4/YG1XWLHqQJmbDH8eqpFAXcVUY+5e/2X2KgWBwPEYA== From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH] Add include dir for nitsi test Date: Sat, 30 Jun 2018 17:54:04 +0200 Message-Id: <20180630155404.5454-1-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.11.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-4.76 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; NEURAL_HAM(-2.66)[-0.886,0]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[100.00%]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[]; ASN(0.00)[asn:34953, ipnet:46.183.96.0/21, country:DE]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_ZERO(0.00)[0] X-Spam-Status: No, score=-4.76 X-Rspamd-Server: mail01.i.ipfire.org 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" 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 --- 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/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