2013-04-09 23:14:36 +00:00
|
|
|
diff -up nss/cmd/Makefile.nosoftokentests nss/cmd/Makefile
|
|
|
|
|
--- nss/cmd/Makefile.nosoftokentests 2012-12-22 14:06:13.193304912 -0800
|
|
|
|
|
+++ nss/cmd/Makefile 2012-12-22 14:10:04.942248630 -0800
|
2012-12-23 01:50:41 +00:00
|
|
|
@@ -14,6 +14,14 @@ ifdef BUILD_LIBPKIX_TESTS
|
|
|
|
|
DIRS += libpkix
|
2012-12-17 06:25:51 +00:00
|
|
|
endif
|
|
|
|
|
|
2012-12-23 01:50:41 +00:00
|
|
|
+# nss-softoken only tests
|
2012-12-17 06:25:51 +00:00
|
|
|
+BLTEST_SRCDIR=
|
|
|
|
|
+FIPSTEST_SRCDIR=
|
2012-12-23 01:50:41 +00:00
|
|
|
+ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
|
|
|
|
|
+BLTEST_SRCDIR=bltest # Add the bltest directory to DIRS.
|
|
|
|
|
+FIPSTEST_SRCDIR=fipstest # Add the fipstest directory to DIRS.
|
|
|
|
|
+endif
|
2012-12-17 06:25:51 +00:00
|
|
|
+
|
2012-12-23 01:50:41 +00:00
|
|
|
LOWHASHTEST_SRCDIR=
|
|
|
|
|
ifeq ($(FREEBL_LOWHASH),1)
|
|
|
|
|
LOWHASHTEST_SRCDIR = lowhashtest # Add the lowhashtest directory to DIRS.
|
2013-04-09 23:14:36 +00:00
|
|
|
diff -up nss/cmd/manifest.mn.nosoftokentests nss/cmd/manifest.mn
|
|
|
|
|
--- nss/cmd/manifest.mn.nosoftokentests 2012-12-22 14:06:35.191293837 -0800
|
|
|
|
|
+++ nss/cmd/manifest.mn 2012-12-22 14:11:22.342263467 -0800
|
2012-12-17 06:25:51 +00:00
|
|
|
@@ -11,7 +11,7 @@ REQUIRES = nss nspr libdbm
|
|
|
|
|
DIRS = lib \
|
|
|
|
|
addbuiltin \
|
|
|
|
|
atob \
|
|
|
|
|
- bltest \
|
|
|
|
|
+ $(BLTEST_SRCDIR) \
|
|
|
|
|
btoa \
|
|
|
|
|
certcgi \
|
|
|
|
|
certutil \
|
|
|
|
|
@@ -23,7 +23,7 @@ DIRS = lib \
|
|
|
|
|
derdump \
|
|
|
|
|
digest \
|
|
|
|
|
httpserv \
|
|
|
|
|
- fipstest \
|
|
|
|
|
+ $(FIPSTEST_SRCDIR) \
|
|
|
|
|
$(LOWHASHTEST_SRCDIR) \
|
|
|
|
|
listsuites \
|
|
|
|
|
makepqg \
|
