diff mbox series

[1/2] testsuite: fix modinfo test without openssl

Message ID 20190204223249.27531-1-lucas.demarchi@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] testsuite: fix modinfo test without openssl | expand

Commit Message

Lucas De Marchi Feb. 4, 2019, 10:32 p.m. UTC 
---
 .../correct-sig_hashalgo-openssl.txt             |  3 +++
 .../test-modinfo/correct-sig_hashalgo.txt        |  3 ++-
 .../test-modinfo/correct-sig_key-openssl.txt     |  3 +++
 .../test-modinfo/correct-sig_key.txt             |  2 +-
 .../test-modinfo/correct-signer-openssl.txt      |  3 +++
 .../test-modinfo/correct-signer.txt              |  2 +-
 testsuite/test-modinfo.c                         | 16 ++++++++++++----
 7 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
 create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
 create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt

Comments

Yauheni Kaliuta Feb. 4, 2019, 10:41 p.m. UTC | #1 
Hi, Lucas!

Oops :)

Thanks for fixing that!

>>>>> On Mon,  4 Feb 2019 14:32:48 -0800, Lucas De Marchi  wrote:

 > ---
 >  .../correct-sig_hashalgo-openssl.txt             |  3 +++
 >  .../test-modinfo/correct-sig_hashalgo.txt        |  3 ++-
 >  .../test-modinfo/correct-sig_key-openssl.txt     |  3 +++
 >  .../test-modinfo/correct-sig_key.txt             |  2 +-
 >  .../test-modinfo/correct-signer-openssl.txt      |  3 +++
 >  .../test-modinfo/correct-signer.txt              |  2 +-
 >  testsuite/test-modinfo.c                         | 16 ++++++++++++----
 >  7 files changed, 25 insertions(+), 7 deletions(-)
 >  create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
 >  create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
 >  create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt

 > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
 > new file mode 100644
 > index 0000000..f97c4fa
 > --- /dev/null
 > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
 > @@ -0,0 +1,3 @@
 > +sha1
 > +sha256
 > +sha256
 > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
 > index f97c4fa..23cb933 100644
 > --- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
 > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
 > @@ -1,3 +1,4 @@
 >  sha1
 >  sha256
 > -sha256
 > +unknown
 > +
 > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
 > new file mode 100644
 > index 0000000..25a75a8
 > --- /dev/null
 > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
 > @@ -0,0 +1,3 @@
 > +E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
 > +E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
 > +26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68
 > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
 > index 25a75a8..7dc4c6a 100644
 > --- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
 > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
 > @@ -1,3 +1,3 @@
 >  E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
 >  E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
 > -26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68
 > +
 > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
 > new file mode 100644
 > index 0000000..2b979f9
 > --- /dev/null
 > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
 > @@ -0,0 +1,3 @@
 > +Magrathea: Glacier signing key
 > +Magrathea: Glacier signing key
 > +Build time autogenerated kernel key
 > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
 > index 2b979f9..afe83df 100644
 > --- a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
 > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
 > @@ -1,3 +1,3 @@
 >  Magrathea: Glacier signing key
 >  Magrathea: Glacier signing key
 > -Build time autogenerated kernel key
 > +
 > diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
 > index 504d9dd..373dc95 100644
 > --- a/testsuite/test-modinfo.c
 > +++ b/testsuite/test-modinfo.c
 > @@ -27,7 +27,7 @@
 
 >  static const char *progname = ABS_TOP_BUILDDIR "/tools/modinfo";
 
 > -#define DEFINE_MODINFO_TEST(_field, ...) \
 > +#define DEFINE_MODINFO_TEST(_field, _flavor, ...) \
 >  static noreturn int test_modinfo_##_field(const struct test *t) \
 >  { \
 >  	const char *const args[] = { \
 > @@ -44,20 +44,28 @@ DEFINE_TEST(test_modinfo_##_field, \
 >  		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/", \
 >  	}, \
 >  	.output = { \
 > -		.out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field ".txt", \
 > +		.out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field #_flavor ".txt", \
 >  	})
 
 >  #define DEFINE_MODINFO_GENERIC_TEST(_field) \
 > -	DEFINE_MODINFO_TEST(_field, \
 > +	DEFINE_MODINFO_TEST(_field, , \
 >  			    "/mod-simple-i386.ko", \
 >  			    "/mod-simple-x86_64.ko", \
 >  			    "/mod-simple-sparc64.ko")
 
 > +#ifdef ENABLE_OPENSSL
 >  #define DEFINE_MODINFO_SIGN_TEST(_field) \
 > -	DEFINE_MODINFO_TEST(_field, \
 > +	DEFINE_MODINFO_TEST(_field, -openssl, \
 >  			    "/mod-simple-sha1.ko", \
 >  			    "/mod-simple-sha256.ko",	\
 >  			    "/mod-simple-pkcs7.ko")
 > +#else
 > +#define DEFINE_MODINFO_SIGN_TEST(_field) \
 > +	DEFINE_MODINFO_TEST(_field, , \
 > +			    "/mod-simple-sha1.ko", \
 > +			    "/mod-simple-sha256.ko",	\
 > +			    "/mod-simple-pkcs7.ko")
 > +#endif
 
 >  DEFINE_MODINFO_GENERIC_TEST(filename);
 >  DEFINE_MODINFO_GENERIC_TEST(author);
 > -- 
 > 2.20.0
Lucas De Marchi Feb. 5, 2019, 9:01 p.m. UTC | #2 
On Mon, Feb 4, 2019 at 3:18 PM Yauheni Kaliuta
<yauheni.kaliuta@redhat.com> wrote:
>
> Hi, Lucas!
>
> Oops :)
>
> Thanks for fixing that!

These are pushed, together with your patches and other 2 to enable
tests on CI/mkosi

Lucas De Marchi

>
> >>>>> On Mon,  4 Feb 2019 14:32:48 -0800, Lucas De Marchi  wrote:
>
>  > ---
>  >  .../correct-sig_hashalgo-openssl.txt             |  3 +++
>  >  .../test-modinfo/correct-sig_hashalgo.txt        |  3 ++-
>  >  .../test-modinfo/correct-sig_key-openssl.txt     |  3 +++
>  >  .../test-modinfo/correct-sig_key.txt             |  2 +-
>  >  .../test-modinfo/correct-signer-openssl.txt      |  3 +++
>  >  .../test-modinfo/correct-signer.txt              |  2 +-
>  >  testsuite/test-modinfo.c                         | 16 ++++++++++++----
>  >  7 files changed, 25 insertions(+), 7 deletions(-)
>  >  create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
>  >  create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
>  >  create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
>
>  > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
>  > new file mode 100644
>  > index 0000000..f97c4fa
>  > --- /dev/null
>  > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
>  > @@ -0,0 +1,3 @@
>  > +sha1
>  > +sha256
>  > +sha256
>  > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
>  > index f97c4fa..23cb933 100644
>  > --- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
>  > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
>  > @@ -1,3 +1,4 @@
>  >  sha1
>  >  sha256
>  > -sha256
>  > +unknown
>  > +
>  > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
>  > new file mode 100644
>  > index 0000000..25a75a8
>  > --- /dev/null
>  > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
>  > @@ -0,0 +1,3 @@
>  > +E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
>  > +E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
>  > +26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68
>  > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
>  > index 25a75a8..7dc4c6a 100644
>  > --- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
>  > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
>  > @@ -1,3 +1,3 @@
>  >  E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
>  >  E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
>  > -26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68
>  > +
>  > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
>  > new file mode 100644
>  > index 0000000..2b979f9
>  > --- /dev/null
>  > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
>  > @@ -0,0 +1,3 @@
>  > +Magrathea: Glacier signing key
>  > +Magrathea: Glacier signing key
>  > +Build time autogenerated kernel key
>  > diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
>  > index 2b979f9..afe83df 100644
>  > --- a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
>  > +++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
>  > @@ -1,3 +1,3 @@
>  >  Magrathea: Glacier signing key
>  >  Magrathea: Glacier signing key
>  > -Build time autogenerated kernel key
>  > +
>  > diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
>  > index 504d9dd..373dc95 100644
>  > --- a/testsuite/test-modinfo.c
>  > +++ b/testsuite/test-modinfo.c
>  > @@ -27,7 +27,7 @@
>
>  >  static const char *progname = ABS_TOP_BUILDDIR "/tools/modinfo";
>
>  > -#define DEFINE_MODINFO_TEST(_field, ...) \
>  > +#define DEFINE_MODINFO_TEST(_field, _flavor, ...) \
>  >  static noreturn int test_modinfo_##_field(const struct test *t) \
>  >  { \
>  >      const char *const args[] = { \
>  > @@ -44,20 +44,28 @@ DEFINE_TEST(test_modinfo_##_field, \
>  >              [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/", \
>  >      }, \
>  >      .output = { \
>  > -            .out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field ".txt", \
>  > +            .out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field #_flavor ".txt", \
>  >      })
>
>  >  #define DEFINE_MODINFO_GENERIC_TEST(_field) \
>  > -    DEFINE_MODINFO_TEST(_field, \
>  > +    DEFINE_MODINFO_TEST(_field, , \
>  >                          "/mod-simple-i386.ko", \
>  >                          "/mod-simple-x86_64.ko", \
>  >                          "/mod-simple-sparc64.ko")
>
>  > +#ifdef ENABLE_OPENSSL
>  >  #define DEFINE_MODINFO_SIGN_TEST(_field) \
>  > -    DEFINE_MODINFO_TEST(_field, \
>  > +    DEFINE_MODINFO_TEST(_field, -openssl, \
>  >                          "/mod-simple-sha1.ko", \
>  >                          "/mod-simple-sha256.ko",    \
>  >                          "/mod-simple-pkcs7.ko")
>  > +#else
>  > +#define DEFINE_MODINFO_SIGN_TEST(_field) \
>  > +    DEFINE_MODINFO_TEST(_field, , \
>  > +                        "/mod-simple-sha1.ko", \
>  > +                        "/mod-simple-sha256.ko",    \
>  > +                        "/mod-simple-pkcs7.ko")
>  > +#endif
>
>  >  DEFINE_MODINFO_GENERIC_TEST(filename);
>  >  DEFINE_MODINFO_GENERIC_TEST(author);
>  > --
>  > 2.20.0
>
>
> --
> WBR,
> Yauheni Kaliuta
diff mbox series

Patch

diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
new file mode 100644
index 0000000..f97c4fa
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt
@@ -0,0 +1,3 @@ 
+sha1
+sha256
+sha256
diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
index f97c4fa..23cb933 100644
--- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
+++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt
@@ -1,3 +1,4 @@ 
 sha1
 sha256
-sha256
+unknown
+
diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
new file mode 100644
index 0000000..25a75a8
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt
@@ -0,0 +1,3 @@ 
+E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
+E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
+26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68
diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
index 25a75a8..7dc4c6a 100644
--- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
+++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt
@@ -1,3 +1,3 @@ 
 E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
 E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9
-26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68
+
diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
new file mode 100644
index 0000000..2b979f9
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt
@@ -0,0 +1,3 @@ 
+Magrathea: Glacier signing key
+Magrathea: Glacier signing key
+Build time autogenerated kernel key
diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
index 2b979f9..afe83df 100644
--- a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
+++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt
@@ -1,3 +1,3 @@ 
 Magrathea: Glacier signing key
 Magrathea: Glacier signing key
-Build time autogenerated kernel key
+
diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
index 504d9dd..373dc95 100644
--- a/testsuite/test-modinfo.c
+++ b/testsuite/test-modinfo.c
@@ -27,7 +27,7 @@ 
 
 static const char *progname = ABS_TOP_BUILDDIR "/tools/modinfo";
 
-#define DEFINE_MODINFO_TEST(_field, ...) \
+#define DEFINE_MODINFO_TEST(_field, _flavor, ...) \
 static noreturn int test_modinfo_##_field(const struct test *t) \
 { \
 	const char *const args[] = { \
@@ -44,20 +44,28 @@  DEFINE_TEST(test_modinfo_##_field, \
 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/", \
 	}, \
 	.output = { \
-		.out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field ".txt", \
+		.out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field #_flavor ".txt", \
 	})
 
 #define DEFINE_MODINFO_GENERIC_TEST(_field) \
-	DEFINE_MODINFO_TEST(_field, \
+	DEFINE_MODINFO_TEST(_field, , \
 			    "/mod-simple-i386.ko", \
 			    "/mod-simple-x86_64.ko", \
 			    "/mod-simple-sparc64.ko")
 
+#ifdef ENABLE_OPENSSL
 #define DEFINE_MODINFO_SIGN_TEST(_field) \
-	DEFINE_MODINFO_TEST(_field, \
+	DEFINE_MODINFO_TEST(_field, -openssl, \
 			    "/mod-simple-sha1.ko", \
 			    "/mod-simple-sha256.ko",	\
 			    "/mod-simple-pkcs7.ko")
+#else
+#define DEFINE_MODINFO_SIGN_TEST(_field) \
+	DEFINE_MODINFO_TEST(_field, , \
+			    "/mod-simple-sha1.ko", \
+			    "/mod-simple-sha256.ko",	\
+			    "/mod-simple-pkcs7.ko")
+#endif
 
 DEFINE_MODINFO_GENERIC_TEST(filename);
 DEFINE_MODINFO_GENERIC_TEST(author);