From: Jonatan Schlag Date: Mon, 25 Jun 2018 09:01:42 +0000 (+0200) Subject: Adapt settings file of nitsi tests to new syntax X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae717b83d0b2f7046db7c84f9298469b72988791;p=people%2Fstevee%2Fnetwork.git Adapt settings file of nitsi tests to new syntax 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 Signed-off-by: Michael Tremer --- diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings index ee066ce3..ab79a30e 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 cac865de..78d6fe0f 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