Bug 1348809 - disable chains tests in all.sh for gyp builds, r=ttaubert

--HG-- extra : rebase_source : 99400750bcab908872fcb5949c5668f5b97dd465
sailfishos-mirror · Mar 20, 2017 · 74ac2a7 · 74ac2a7
1 parent 315e09b
commit 74ac2a7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tests/all.sh b/tests/all.sh
@@ -273,7 +273,11 @@ run_cycles()
 cycles="standard pkix upgradedb sharedb"
 CYCLES=${NSS_CYCLES:-$cycles}
 
-tests="cipher lowhash libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains ec gtests ssl_gtests"
+tests="cipher lowhash libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits ec gtests ssl_gtests"
+# Don't run chains tests when we have a gyp build.
+if [ "$OBJDIR" != "Debug" -a "$OBJDIR" != "Release" ]; then
+  tests="$tests chains"
+fi
 TESTS=${NSS_TESTS:-$tests}
 
 ALL_TESTS=${TESTS}