summaryrefslogtreecommitdiff
path: root/nss.gyp
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2017-08-18 11:17:18 +0200
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2017-08-18 11:17:18 +0200
commit09b8fe651ffe6895baa2f8701b1c9e3d37c8da7f (patch)
tree04ceaef7a16388a73befbddee49f51e9c210c24b /nss.gyp
parentbab319624b8a3ad474b7767a2498f698d1d4ba86 (diff)
downloadnss-hg-09b8fe651ffe6895baa2f8701b1c9e3d37c8da7f.tar.gz
Bug 1370667 - don't do startup tests when not in fips mode, r=ttaubert,rrelyea
Differential Revision: https://nss-review.dev.mozaws.net/D348
Diffstat (limited to 'nss.gyp')
-rw-r--r--nss.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/nss.gyp b/nss.gyp
index 1727dbe0b..5a9baa537 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -131,7 +131,6 @@
'cmd/digest/digest.gyp:digest',
'cmd/ecperf/ecperf.gyp:ecperf',
'cmd/fbectest/fbectest.gyp:fbectest',
- 'cmd/fipstest/fipstest.gyp:fipstest',
'cmd/httpserv/httpserv.gyp:httpserv',
'cmd/listsuites/listsuites.gyp:listsuites',
'cmd/makepqg/makepqg.gyp:makepqg',
@@ -190,6 +189,11 @@
'gtests/freebl_gtest/freebl_gtest.gyp:freebl_gtest',
],
}],
+ [ 'disable_fips==0', {
+ 'dependencies': [
+ 'cmd/fipstest/fipstest.gyp:fipstest',
+ ],
+ }],
],
},
],