74fc46
diff -up nss/gtests/manifest.mn.skip-util-gtests nss/gtests/manifest.mn
74fc46
--- nss/gtests/manifest.mn.skip-util-gtests	2017-09-20 08:47:27.000000000 +0200
74fc46
+++ nss/gtests/manifest.mn	2017-10-19 11:02:27.773910909 +0200
74fc46
@@ -32,6 +32,5 @@ endif
74fc46
 
74fc46
 DIRS = \
74fc46
 	$(LIB_SRCDIRS) \
74fc46
-	$(UTIL_SRCDIRS) \
74fc46
 	$(NSS_SRCDIRS) \
74fc46
 	$(NULL)
74fc46
diff -up nss/gtests/ssl_gtest/manifest.mn.skip-util-gtests nss/gtests/ssl_gtest/manifest.mn
74fc46
--- nss/gtests/ssl_gtest/manifest.mn.skip-util-gtests	2017-09-20 08:47:27.000000000 +0200
74fc46
+++ nss/gtests/ssl_gtest/manifest.mn	2017-10-19 11:02:27.773910909 +0200
74fc46
@@ -58,6 +58,7 @@ PROGRAM = ssl_gtest
74fc46
 EXTRA_LIBS += \
74fc46
       $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
74fc46
       $(DIST)/lib/$(LIB_PREFIX)cpputil.$(LIB_SUFFIX) \
74fc46
+      -lsoftokn3
74fc46
       $(NULL)
74fc46
 
74fc46
 USE_STATIC_LIBS = 1
74fc46
diff -up nss/tests/gtests/gtests.sh.skip-util-gtests nss/tests/gtests/gtests.sh
74fc46
--- nss/tests/gtests/gtests.sh.skip-util-gtests	2017-09-20 08:47:27.000000000 +0200
74fc46
+++ nss/tests/gtests/gtests.sh	2017-10-19 11:03:57.473976538 +0200
74fc46
@@ -83,7 +83,7 @@ gtest_cleanup()
74fc46
 }
74fc46
 
74fc46
 ################## main #################################################
74fc46
-GTESTS="prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest blake2b_gtest"
74fc46
+GTESTS="certhigh_gtest certdb_gtest der_gtest pk11_gtest softoken_gtest"
74fc46
 SOURCE_DIR="$PWD"/../..
74fc46
 gtest_init $0
74fc46
 gtest_start