From: Jonatan Schlag <jonatan.schlag@ipfire.org>
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 [thread overview]
Message-ID: <20180625090143.31218-2-jonatan.schlag@ipfire.org> (raw)
In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1814 bytes --]
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 <jonatan.schlag(a)ipfire.org>
---
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(a)-@PACKAGE_VERSION(a).tar.gz
-Copy_to = /root/
+copy_from = ../../../../@PACKAGE_NAME(a)-@PACKAGE_VERSION(a).tar.gz
+copy_to = /root/
[VIRTUAL_ENVIRONMENT]
-Name = basic
path = ../../virtual-environment/basic
--
2.11.0
next prev parent reply other threads:[~2018-06-25 9:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 9:01 [PATCH 1/3] Adapt nitsi command line " Jonatan Schlag
2018-06-25 9:01 ` Jonatan Schlag [this message]
2018-06-25 9:01 ` [PATCH 3/3] We need to change the path of the image in the settings file to Jonatan Schlag
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180625090143.31218-2-jonatan.schlag@ipfire.org \
--to=jonatan.schlag@ipfire.org \
--cc=network@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox