]> granicus.if.org Git - zfs/commitdiff
hkdf_test binary should only have one icp instance
authorDon Brady <don.brady@delphix.com>
Wed, 5 Jun 2019 21:21:25 +0000 (15:21 -0600)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 7 Jun 2019 19:45:40 +0000 (12:45 -0700)
The build for test binary hkdf_test was linking both against libicp
and libzpool. This results in two instances of libicp inside the
binary but the call to icp_init() only initializes one of them!

Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Don Brady <don.brady@delphix.com>
Closes #8850

tests/zfs-tests/tests/functional/hkdf/Makefile.am

index d0a68f442fab52bd5fceebe74198803d31e9736a..3ac26ed21c1685f74d9c7a97a7a43943ccce4a28 100644 (file)
@@ -2,8 +2,7 @@ include $(top_srcdir)/config/Rules.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/lib/libspl/include
-LDADD = $(top_srcdir)/lib/libicp/libicp.la
-LDADD += $(top_srcdir)/lib/libzpool/libzpool.la
+LDADD = $(top_srcdir)/lib/libzpool/libzpool.la
 
 AUTOMAKE_OPTIONS = subdir-objects