From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 26 Jul 2017 08:02:21 +0000 (+0200)
Subject: tests: Extract mock library for making hash table deterministic
X-Git-Tag: v3.6.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=498336836772cc222f956116e9c535c273f87422;p=thirdparty%2Flibvirt.git

tests: Extract mock library for making hash table deterministic

virHashNew calls virRandomBits to initialize seed for the hashing
function. If a test uses iteration through the hash table to produce
results they may/will be non-deterministic. Extract the mock library
which was used for mac address mapping to be universal.

Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 11a3801631..8349bbec41 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1206,22 +1206,23 @@ else ! WITH_NSS
 EXTRA_DIST += nsstest.c nssmock.c nsslinktest.c
 endif ! WITH_NSS
 
-if WITH_YAJL
-virmacmapmock_la_SOURCES = \
-	virmacmapmock.c
-virmacmapmock_la_CFLAGS = $(AM_CFLAGS)
-virmacmapmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-virmacmapmock_la_LIBADD = $(MOCKLIBS_LIBS)
+virdeterministichashmock_la_SOURCES = \
+	virdeterministichashmock.c
+virdeterministichashmock_la_CFLAGS = $(AM_CFLAGS)
+virdeterministichashmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
+virdeterministichashmock_la_LIBADD = $(MOCKLIBS_LIBS)
+
+test_libraries += virdeterministichashmock.la
 
+if WITH_YAJL
 virmacmaptest_SOURCES = \
 	virmacmaptest.c testutils.h testutils.c
 virmacmaptest_CLFAGS = $(AM_CFLAGS)
 virmacmaptest_LDADD = $(LDADDS)
 
-test_libraries += virmacmapmock.la
 test_programs += virmacmaptest
 else ! WITH_YAJL
-EXTRA_DIST += virmacmapmock.c virmacmaptest.c
+EXTRA_DIST +=  virmacmaptest.c
 endif ! WITH_YAJL
 
 virnetdevtest_SOURCES = \
diff --git a/tests/virmacmapmock.c b/tests/virdeterministichashmock.c
similarity index 100%
rename from tests/virmacmapmock.c
rename to tests/virdeterministichashmock.c
diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c
index 35e3127717..0627fb37a5 100644
--- a/tests/virmacmaptest.c
+++ b/tests/virmacmaptest.c
@@ -234,4 +234,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmacmapmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdeterministichashmock.so")