* [Qemu-devel] [PATCH v2] qtest: fix make check complaint in crypto module
@ 2016-09-22 8:56 Gonglei
2016-09-23 10:20 ` Daniel P. Berrange
0 siblings, 1 reply; 3+ messages in thread
From: Gonglei @ 2016-09-22 8:56 UTC (permalink / raw)
To: qemu-devel; +Cc: berrange, wu.wubin, Gonglei
CC tests/test-crypto-tlscredsx509.o
CC tests/crypto-tls-x509-helpers.o
CC tests/pkix_asn1_tab.o
tests/pkix_asn1_tab.c:7:22: warning: libtasn1.h: No such file or directory
tests/pkix_asn1_tab.c:9: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘pkix_asn1_tab’
make: *** [tests/pkix_asn1_tab.o] Error 1
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
v2: add condition check for TLS support (Daniel)
---
tests/pkix_asn1_tab.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c
index 903bc02..036e222b 100644
--- a/tests/pkix_asn1_tab.c
+++ b/tests/pkix_asn1_tab.c
@@ -4,6 +4,14 @@
*/
#include "qemu/osdep.h"
+#if !(defined WIN32) && \
+ defined(CONFIG_TASN1) && \
+ (LIBGNUTLS_VERSION_NUMBER >= 0x020600)
+#define QCRYPTO_HAVE_TLS_TEST_SUPPORT
+#endif
+
+#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
+
#include <libtasn1.h>
const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
@@ -1103,3 +1111,4 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
{0, 1048586, "2"},
{0, 0, 0}
};
+#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
--
1.7.12.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v2] qtest: fix make check complaint in crypto module
2016-09-22 8:56 [Qemu-devel] [PATCH v2] qtest: fix make check complaint in crypto module Gonglei
@ 2016-09-23 10:20 ` Daniel P. Berrange
2016-09-24 0:36 ` Gonglei (Arei)
0 siblings, 1 reply; 3+ messages in thread
From: Daniel P. Berrange @ 2016-09-23 10:20 UTC (permalink / raw)
To: Gonglei; +Cc: qemu-devel, wu.wubin
On Thu, Sep 22, 2016 at 04:56:39PM +0800, Gonglei wrote:
> CC tests/test-crypto-tlscredsx509.o
> CC tests/crypto-tls-x509-helpers.o
> CC tests/pkix_asn1_tab.o
> tests/pkix_asn1_tab.c:7:22: warning: libtasn1.h: No such file or directory
> tests/pkix_asn1_tab.c:9: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘pkix_asn1_tab’
> make: *** [tests/pkix_asn1_tab.o] Error 1
>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
> v2: add condition check for TLS support (Daniel)
> ---
> tests/pkix_asn1_tab.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c
> index 903bc02..036e222b 100644
> --- a/tests/pkix_asn1_tab.c
> +++ b/tests/pkix_asn1_tab.c
> @@ -4,6 +4,14 @@
> */
>
> #include "qemu/osdep.h"
> +#if !(defined WIN32) && \
> + defined(CONFIG_TASN1) && \
> + (LIBGNUTLS_VERSION_NUMBER >= 0x020600)
> +#define QCRYPTO_HAVE_TLS_TEST_SUPPORT
> +#endif
This doesn't actually build
tests/pkix_asn1_tab.c:9:6: error: "LIBGNUTLS_VERSION_NUMBER" is not defined [-Werror=undef]
(LIBGNUTLS_VERSION_NUMBER >= 0x020600)
^~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
/home/berrange/src/virt/qemu/rules.mak:60: recipe for target 'tests/pkix_asn1_tab.o' failed
make: *** [tests/pkix_asn1_tab.o] Error 1
This is because you missed the gnutls.h include. Rather than
repeating the condition here, you sould just #include the
existing tests/crypto-tls-x509-helpers.h header
> +
> +#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
> +
> #include <libtasn1.h>
>
> const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
> @@ -1103,3 +1111,4 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
> {0, 1048586, "2"},
> {0, 0, 0}
> };
> +#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
> --
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v2] qtest: fix make check complaint in crypto module
2016-09-23 10:20 ` Daniel P. Berrange
@ 2016-09-24 0:36 ` Gonglei (Arei)
0 siblings, 0 replies; 3+ messages in thread
From: Gonglei (Arei) @ 2016-09-24 0:36 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Wubin (H)
> -----Original Message-----
> From: Daniel P. Berrange [mailto:berrange@redhat.com]
> Sent: Friday, September 23, 2016 6:21 PM
> To: Gonglei (Arei)
> Cc: qemu-devel@nongnu.org; Wubin (H)
> Subject: Re: [PATCH v2] qtest: fix make check complaint in crypto module
>
> On Thu, Sep 22, 2016 at 04:56:39PM +0800, Gonglei wrote:
> > CC tests/test-crypto-tlscredsx509.o
> > CC tests/crypto-tls-x509-helpers.o
> > CC tests/pkix_asn1_tab.o
> > tests/pkix_asn1_tab.c:7:22: warning: libtasn1.h: No such file or directory
> > tests/pkix_asn1_tab.c:9: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
> ‘__attribute__’ before ‘pkix_asn1_tab’
> > make: *** [tests/pkix_asn1_tab.o] Error 1
> >
> > Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> > ---
> > v2: add condition check for TLS support (Daniel)
> > ---
> > tests/pkix_asn1_tab.c | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c
> > index 903bc02..036e222b 100644
> > --- a/tests/pkix_asn1_tab.c
> > +++ b/tests/pkix_asn1_tab.c
> > @@ -4,6 +4,14 @@
> > */
> >
> > #include "qemu/osdep.h"
> > +#if !(defined WIN32) && \
> > + defined(CONFIG_TASN1) && \
> > + (LIBGNUTLS_VERSION_NUMBER >= 0x020600)
> > +#define QCRYPTO_HAVE_TLS_TEST_SUPPORT
> > +#endif
>
> This doesn't actually build
>
> tests/pkix_asn1_tab.c:9:6: error: "LIBGNUTLS_VERSION_NUMBER" is not
> defined [-Werror=undef]
> (LIBGNUTLS_VERSION_NUMBER >= 0x020600)
> ^~~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> /home/berrange/src/virt/qemu/rules.mak:60: recipe for target
> 'tests/pkix_asn1_tab.o' failed
> make: *** [tests/pkix_asn1_tab.o] Error 1
>
Oops, I didn't encounter it because CONFIG_TASN1 is not defined in my environment.
>
> This is because you missed the gnutls.h include. Rather than
> repeating the condition here, you sould just #include the
> existing tests/crypto-tls-x509-helpers.h header
>
Yes, you are definitely right, thanks! V3 will come.
Regards,
-Gonglei
> > +
> > +#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
> > +
> > #include <libtasn1.h>
> >
> > const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
> > @@ -1103,3 +1111,4 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
> > {0, 1048586, "2"},
> > {0, 0, 0}
> > };
> > +#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
> > --
>
> Regards,
> Daniel
> --
> |: http://berrange.com -o-
> http://www.flickr.com/photos/dberrange/ :|
> |: http://libvirt.org -o-
> http://virt-manager.org :|
> |: http://autobuild.org -o-
> http://search.cpan.org/~danberr/ :|
> |: http://entangle-photo.org -o-
> http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-24 0:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-22 8:56 [Qemu-devel] [PATCH v2] qtest: fix make check complaint in crypto module Gonglei
2016-09-23 10:20 ` Daniel P. Berrange
2016-09-24 0:36 ` Gonglei (Arei)
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.