| Message ID | 1459783474-23588-1-git-send-email-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 4/4/2016 at 09:24 AM, "Daniel P. Berrange" <berrange@redhat.com> wrote: > The pbkdf test is being built based on a check for CONFIG_NETTLE. > As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be > instead checking CONFIG_NETTLE_KDF > > Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Reported-by: Bruce Rogers <brogers@suse.com> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/Makefile b/tests/Makefile > index 45b9048..651d8b2 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += > tests/test-io-channel-tls$(EXESUF) > check-unit-y += tests/test-io-channel-command$(EXESUF) > check-unit-y += tests/test-io-channel-buffer$(EXESUF) > check-unit-y += tests/test-base64$(EXESUF) > -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += > tests/test-crypto-pbkdf$(EXESUF) > +check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += > tests/test-crypto-pbkdf$(EXESUF) > check-unit-y += tests/test-crypto-ivgen$(EXESUF) > check-unit-y += tests/test-crypto-afsplit$(EXESUF) > check-unit-y += tests/test-crypto-xts$(EXESUF) This is the same patch I've been running with - which has worked fine for me. Thanks! Bruce Tested-by: Bruce Rogers <brogers@suse.com>
On 4 April 2016 at 20:01, Bruce Rogers <brogers@suse.com> wrote: >>>> On 4/4/2016 at 09:24 AM, "Daniel P. Berrange" <berrange@redhat.com> wrote: >> The pbkdf test is being built based on a check for CONFIG_NETTLE. >> As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be >> instead checking CONFIG_NETTLE_KDF >> >> Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >> Reported-by: Bruce Rogers <brogers@suse.com> >> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> >> --- >> tests/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/Makefile b/tests/Makefile >> index 45b9048..651d8b2 100644 >> --- a/tests/Makefile >> +++ b/tests/Makefile >> @@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += >> tests/test-io-channel-tls$(EXESUF) >> check-unit-y += tests/test-io-channel-command$(EXESUF) >> check-unit-y += tests/test-io-channel-buffer$(EXESUF) >> check-unit-y += tests/test-base64$(EXESUF) >> -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += >> tests/test-crypto-pbkdf$(EXESUF) >> +check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += >> tests/test-crypto-pbkdf$(EXESUF) >> check-unit-y += tests/test-crypto-ivgen$(EXESUF) >> check-unit-y += tests/test-crypto-afsplit$(EXESUF) >> check-unit-y += tests/test-crypto-xts$(EXESUF) > > This is the same patch I've been running with - which has worked fine for me. > Thanks! > > Bruce > > Tested-by: Bruce Rogers <brogers@suse.com> This fixes one of the three FreeBSD test failures I reported earlier in the thread "[PATCH v2 0/2] Fix for compile on FreeBSD/i386 (and others?)". Tested-by: Ed Maste <emaste@freebsd.org>
On 04/04/2016 17:24, Daniel P. Berrange wrote: > The pbkdf test is being built based on a check for CONFIG_NETTLE. > As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be > instead checking CONFIG_NETTLE_KDF > > Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Reported-by: Bruce Rogers <brogers@suse.com> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/Makefile b/tests/Makefile > index 45b9048..651d8b2 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += tests/test-io-channel-tls$(EXESUF) > check-unit-y += tests/test-io-channel-command$(EXESUF) > check-unit-y += tests/test-io-channel-buffer$(EXESUF) > check-unit-y += tests/test-base64$(EXESUF) > -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) > +check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) > check-unit-y += tests/test-crypto-ivgen$(EXESUF) > check-unit-y += tests/test-crypto-afsplit$(EXESUF) > check-unit-y += tests/test-crypto-xts$(EXESUF) Peter, could you please apply this directly to master for rc1? Thanks, Paolo
On 5 April 2016 at 10:40, Paolo Bonzini <pbonzini@redhat.com> wrote: > > > On 04/04/2016 17:24, Daniel P. Berrange wrote: >> The pbkdf test is being built based on a check for CONFIG_NETTLE. >> As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be >> instead checking CONFIG_NETTLE_KDF >> >> Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >> Reported-by: Bruce Rogers <brogers@suse.com> >> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> >> --- >> tests/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/Makefile b/tests/Makefile >> index 45b9048..651d8b2 100644 >> --- a/tests/Makefile >> +++ b/tests/Makefile >> @@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += tests/test-io-channel-tls$(EXESUF) >> check-unit-y += tests/test-io-channel-command$(EXESUF) >> check-unit-y += tests/test-io-channel-buffer$(EXESUF) >> check-unit-y += tests/test-base64$(EXESUF) >> -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) >> +check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) >> check-unit-y += tests/test-crypto-ivgen$(EXESUF) >> check-unit-y += tests/test-crypto-afsplit$(EXESUF) >> check-unit-y += tests/test-crypto-xts$(EXESUF) > > Peter, could you please apply this directly to master for rc1? Dan's just sent a pullreq with it in, so I'll apply it via that. thanks -- PMM
diff --git a/tests/Makefile b/tests/Makefile index 45b9048..651d8b2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += tests/test-io-channel-tls$(EXESUF) check-unit-y += tests/test-io-channel-command$(EXESUF) check-unit-y += tests/test-io-channel-buffer$(EXESUF) check-unit-y += tests/test-base64$(EXESUF) -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) +check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) check-unit-y += tests/test-crypto-ivgen$(EXESUF) check-unit-y += tests/test-crypto-afsplit$(EXESUF) check-unit-y += tests/test-crypto-xts$(EXESUF)
The pbkdf test is being built based on a check for CONFIG_NETTLE. As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be instead checking CONFIG_NETTLE_KDF Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Reported-by: Bruce Rogers <brogers@suse.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)