From 09b8fe651ffe6895baa2f8701b1c9e3d37c8da7f Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Fri, 18 Aug 2017 11:17:18 +0200 Subject: Bug 1370667 - don't do startup tests when not in fips mode, r=ttaubert,rrelyea Differential Revision: https://nss-review.dev.mozaws.net/D348 --- nss.gyp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nss.gyp') 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', + ], + }], ], }, ], -- cgit v1.2.1