From mboxrd@z Thu Jan 1 00:00:00 1970 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> In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4288632703294006829==" List-Id: --===============4288632703294006829== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-wor= ld/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 =3D Hello World -Description =3D This is a test to just check if nitsi is working. - -Copy_from =3D -Copy_to =3D /root/ +[GENERAL] +name =3D Hello World +description =3D This is a test to just check if nitsi is working. =20 [VIRTUAL_ENVIRONMENT] -Name =3D basic path =3D ../../virtual-environment/basic =20 diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-ch= eck/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 =3D make check -Description =3D This test runs make install in the virtual environment +[GENERAL] +name =3D make check +description =3D 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 =20 -Copy_from =3D ../../../../@PACKAGE_NAME(a)-@PACKAGE_VERSION(a).tar.gz -Copy_to =3D /root/ +copy_from =3D ../../../../@PACKAGE_NAME(a)-@PACKAGE_VERSION(a).tar.gz +copy_to =3D /root/ =20 [VIRTUAL_ENVIRONMENT] -Name =3D basic path =3D ../../virtual-environment/basic --=20 2.11.0 --===============4288632703294006829==--