From patchwork Mon Jun 25 19:01:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1839 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id E0DDD60AC9 for ; Mon, 25 Jun 2018 11:01:58 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id B662A115A623; Mon, 25 Jun 2018 10:01:58 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917318; 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:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=yBwQLTopsmI+l3Tb7MeLe/vTkVLR4LQkOsgveQZSwe8=; b=a4QBlY6cDqHJbbmtgrjsCijdpCYnJxpkXyJ0Vm6N+mDQXvH1LSfFKzXN3dP0NfCiyQ+OZV 76x1lupCXBXix63XfkbnSRi9fP8yr8azp+iKcXZulQbTfBQDdCh1l9eMXGIruoTLSP0+XS MzTSWcg7ALKenvrrSuyca84M96mkJwcPRq3j/M+BcaftAoXP93ljyumKwatc32oqpV7bWR rUp9k+egqZMjrQXOidU7qUpaWzoMk05NGRnM9Kp1iyRz2IwVwNpbUTdNfj4gNfm7ME0a0r ntMrvKHg6SM3H4kDO5EoxFb+FY6tLQA2jL3voGll+cvRW9JmEM8ohP4zcNnpuA== Received: from bockland.local.familyschlag (fw-1.cvjm.hk-net.de [95.129.212.34]) (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 71F9811490CC; Mon, 25 Jun 2018 10:01:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917316; 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=yBwQLTopsmI+l3Tb7MeLe/vTkVLR4LQkOsgveQZSwe8=; b=IThuSMFzrM35Vg7+piU/UwmDLZsZ4MFEJbU54gcRi2yfZjYWvOSLoALvCcbNXKB5oWrdSo 65utvLPtg+dQ1q61RRjYABFeFuYd+WFl/M97rqj+2/B/WewE4eqNQ9nNZQJ/HBlERaFUcN VgjqhthspnYQCw1JLA7JqbL1GA+YG2xLqjzuKvhGkT/9sH0enw7OEnsJHgVCpmXwO9BZL8 ++BoROBX+kZ92CBl8sUqVk8QQVtgGjVWsoIV2Cx/bhWYEQp32Ch5huYeFW/6gto9+WaGCC qj7qCYuxDnm6K7Nk5eLLSrylZEynAxRmgvAh6ShMZXLm8kisGck/WVjFS59fUQ== From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 2/3] Adapt settings file of nitsi tests to new syntax Date: Mon, 25 Jun 2018 11:01:42 +0200 Message-Id: <20180625090143.31218-2-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org> References: <20180625090143.31218-1-jonatan.schlag@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DKIM_SIGNED(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:44700, ipnet:95.129.208.0/21, country:DE] X-Spam-Status: No, score=-6.10 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" Nitsi is using a new syntax for settings file so we need to change the settings files of our tests. I dropped some settings in the hello-world test because we do not need them for this test. Signed-off-by: Jonatan Schlag --- test/nitsi/test/hello-world/settings | 10 +++------- test/nitsi/test/make-check/settings.in | 11 +++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings index ee066ce..ab79a30 100644 --- a/test/nitsi/test/hello-world/settings +++ b/test/nitsi/test/hello-world/settings @@ -1,11 +1,7 @@ -[DEFAULT] -Name = Hello World -Description = This is a test to just check if nitsi is working. - -Copy_from = -Copy_to = /root/ +[GENERAL] +name = Hello World +description = This is a test to just check if nitsi is working. [VIRTUAL_ENVIRONMENT] -Name = basic path = ../../virtual-environment/basic diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-check/settings.in index cac865d..78d6fe0 100644 --- a/test/nitsi/test/make-check/settings.in +++ b/test/nitsi/test/make-check/settings.in @@ -1,12 +1,11 @@ -[DEFAULT] -Name = make check -Description = This test runs make install in the virtual environment +[GENERAL] +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/ +copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz +copy_to = /root/ [VIRTUAL_ENVIRONMENT] -Name = basic path = ../../virtual-environment/basic