From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: linux-modules@vger.kernel.org
Subject: Re: [PATCH 1/2] testsuite: fix modinfo test without openssl
Date: Tue, 05 Feb 2019 00:41:17 +0200 [thread overview]
Message-ID: <xunymunb6usy.fsf@redhat.com> (raw)
In-Reply-To: <20190204223249.27531-1-lucas.demarchi@intel.com> (Lucas De Marchi's message of "Mon, 4 Feb 2019 14:32:48 -0800")
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
--
WBR,
Yauheni Kaliuta
next prev parent reply other threads:[~2019-02-04 22:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 22:32 [PATCH 1/2] testsuite: fix modinfo test without openssl Lucas De Marchi
2019-02-04 22:32 ` [PATCH 2/2] build: enable openssl by default Lucas De Marchi
2019-02-04 22:41 ` Yauheni Kaliuta [this message]
2019-02-05 21:01 ` [PATCH 1/2] testsuite: fix modinfo test without openssl Lucas De Marchi
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=xunymunb6usy.fsf@redhat.com \
--to=yauheni.kaliuta@redhat.com \
--cc=linux-modules@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.