diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index 908bc11a30..ac70ba51da 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -103,15 +103,6 @@ queue.filter(task => { return false; } - if (task.group == "Test") { - // Don't run test builds on old make platforms, and not for fips gyp. - // Disable on aarch64, see bug 1488331. - if (task.collection == "make" || task.collection == "fips" - || task.platform == "aarch64") { - return false; - } - } - // Don't run all additional hardware tests on ARM. if (task.group == "Cipher" && task.platform == "aarch64" && task.env && (task.env.NSS_DISABLE_PCLMUL == "1" || task.env.NSS_DISABLE_HW_AES == "1" @@ -528,8 +519,6 @@ async function scheduleLinux(name, overrides, args = "") { symbol: "modular" })); - await scheduleTestBuilds(name + " Test", merge(base, {group: "Test"}), args); - return queue.submit(); } @@ -761,71 +750,6 @@ async function scheduleFuzzing32() { return queue.submit(); } -/*****************************************************************************/ - -async function scheduleTestBuilds(name, base, args = "") { - // Build base definition. - let build = merge(base, { - command: [ - "/bin/bash", - "-c", - "bin/checkout.sh && " + - "nss/automation/taskcluster/scripts/build_gyp.sh -g -v --test --ct-verif " + args - ], - artifacts: { - public: { - expires: 24 * 7, - type: "directory", - path: "/home/worker/artifacts" - } - }, - kind: "build", - symbol: "B", - name: `${name} build`, - }); - - // On linux we have a specialized build image for building. - if (build.platform === "linux32" || build.platform === "linux64") { - build = merge(build, { - image: LINUX_BUILDS_IMAGE, - }); - } - - // The task that builds NSPR+NSS. - let task_build = queue.scheduleTask(build); - - // Schedule tests. - queue.scheduleTask(merge(base, { - parent: task_build, - name: `${name} mpi tests`, - command: [ - "/bin/bash", - "-c", - "bin/checkout.sh && nss/automation/taskcluster/scripts/run_tests.sh" - ], - tests: "mpi", - cycle: "standard", - symbol: "mpi", - kind: "test" - })); - queue.scheduleTask(merge(base, { - parent: task_build, - command: [ - "/bin/bash", - "-c", - "bin/checkout.sh && nss/automation/taskcluster/scripts/run_tests.sh" - ], - name: `${name} gtests`, - symbol: "Gtest", - tests: "gtests", - cycle: "standard", - kind: "test" - })); - - return queue.submit(); -} - - /*****************************************************************************/ async function scheduleWindows(name, base, build_script) { @@ -951,6 +875,9 @@ function scheduleTests(task_build, task_cert, test_base) { queue.scheduleTask(merge(no_cert_base, { name: "tlsfuzzer tests", symbol: "tlsfuzzer", tests: "tlsfuzzer", cycle: "standard" })); + queue.scheduleTask(merge(no_cert_base, { + name: "MPI tests", symbol: "MPI", tests: "mpi", cycle: "standard" + })); queue.scheduleTask(merge(cert_base, { name: "Chains tests", symbol: "Chains", tests: "chains" })); diff --git a/build.sh b/build.sh index 5501fe747f..37ff9708c3 100755 --- a/build.sh +++ b/build.sh @@ -94,7 +94,6 @@ while [ $# -gt 0 ]; do --sancov=?*) enable_sancov "${1#*=}" ;; --emit-llvm) gyp_params+=(-Demit_llvm=1 -Dsign_libs=0) ;; --no-zdefs) gyp_params+=(-Dno_zdefs=1) ;; - --test) gyp_params+=(-Dtest_build=1 -Dstatic_libs=1) ;; --static) gyp_params+=(-Dstatic_libs=1) ;; --ct-verif) gyp_params+=(-Dct_verif=1) ;; --nspr) nspr_clean; rebuild_nspr=1 ;; diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 6a60d0ddad..e33cdfaa3f 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -106,7 +106,6 @@ 'moz_fold_libs%': 0, 'moz_folded_library_name%': '', 'sanitizer_flags%': 0, - 'test_build%': 0, 'static_libs%': 0, 'no_zdefs%': 0, 'fuzz%': 0, @@ -130,7 +129,6 @@ # This is mostly for linking to libraries. 'variables': { 'mapfile%': '', - 'test_build%': 0, 'static_libs%': 0, 'debug_optimization_level%': '0', 'release_optimization_level%': '2', diff --git a/coreconf/fuzz.sh b/coreconf/fuzz.sh index ef5c53c9dd..da6000cbee 100644 --- a/coreconf/fuzz.sh +++ b/coreconf/fuzz.sh @@ -14,7 +14,7 @@ if [ -z "$CC" ]; then export CXX=clang++ fi -gyp_params+=(-Dtest_build=1 -Dstatic_libs=1 -Dfuzz=1 -Dsign_libs=0) +gyp_params+=(-Dstatic_libs=1 -Dfuzz=1 -Dsign_libs=0) # Add debug symbols even for opt builds. nspr_params+=(--enable-debug-symbols) diff --git a/fuzz/fuzz.gyp b/fuzz/fuzz.gyp index 69e1783190..91e9b25b7f 100644 --- a/fuzz/fuzz.gyp +++ b/fuzz/fuzz.gyp @@ -91,7 +91,7 @@ '-lcrypto', ], }], - # For test builds we have to set MPI defines. + # For static builds we have to set MPI defines. [ 'target_arch=="ia32"', { 'defines': [ 'MP_USE_UINT_DIGIT', diff --git a/gtests/freebl_gtest/freebl_gtest.gyp b/gtests/freebl_gtest/freebl_gtest.gyp index bc9bd95843..238f05e073 100644 --- a/gtests/freebl_gtest/freebl_gtest.gyp +++ b/gtests/freebl_gtest/freebl_gtest.gyp @@ -85,7 +85,7 @@ 'defines': [ 'NSS_USE_STATIC_LIBS', ], - # For test builds we have to set MPI defines. + # For static builds we have to set MPI defines. 'conditions': [ [ 'ct_verif==1', { 'defines': [ diff --git a/help.txt b/help.txt index 547400b8e3..180e9ecf95 100644 --- a/help.txt +++ b/help.txt @@ -3,7 +3,7 @@ Usage: build.sh [-h] [-c|-cc] [-v] [-j ] [--gyp|-g] [--opt|-o] [--clang|--gcc|--msvc] [--scan-build[=dir]] [--disable-tests] [--pprof] [--asan] [--msan] [--ubsan[=bool,shift,...] [--fuzz[=tls|oss]] [--sancov[=edge|bb|func|...]] - [--emit-llvm] [--no-zdefs] [--test] [--ct-verif] + [--emit-llvm] [--no-zdefs] [--static] [--ct-verif] [--nspr|--with-nspr=:|--system-nspr] [--system-sqlite] [--enable-fips] [--enable-libpkix] [--mozpkix-only] [-D] @@ -31,7 +31,7 @@ NSS build tool options: --msan enable memory sanitizer --ubsan enable undefined behavior sanitizer --ubsan=bool,shift,... sets specific UB sanitizers - --fuzz build fuzzing targets (this always enables test builds) + --fuzz build fuzzing targets (this always enables static builds) --fuzz=tls to enable TLS fuzzing mode --fuzz=oss to build for OSS-Fuzz --sancov do sanitize coverage builds @@ -39,7 +39,6 @@ NSS build tool options: --emit-llvm emit LLVM bitcode while building (requires the gold linker, use clang-3.8 for SAW) --no-zdefs don't set -Wl,-z,defs - --test ignore map files and export everything we have --static create static libraries and use static linking --ct-verif build with valgrind for ct-verif --nspr force a rebuild of NSPR diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index eb53e60d85..ddb1d45826 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -126,9 +126,9 @@ '<(DEPTH)/exports.gyp:nss_exports' ] }, - # For test builds, build a static freebl library so we can statically - # link it into the test build binary. This way we don't have to - # dlopen() the shared lib but can directly call freebl functions. + # Build a static freebl library so we can statically link it into + # the binary. This way we don't have to dlopen() the shared lib + # but can directly call freebl functions. { 'target_name': 'freebl_static', 'type': 'static_library', @@ -154,7 +154,7 @@ ], 'conditions': [ [ 'target_arch=="x64"', { - # The AES assembler code doesn't work in static test builds. + # The AES assembler code doesn't work in static builds. # The linker complains about non-relocatable code, and I # currently don't know how to fix this properly. 'sources!': [ diff --git a/nss.gyp b/nss.gyp index 68b9919332..eea35aaeae 100644 --- a/nss.gyp +++ b/nss.gyp @@ -192,6 +192,7 @@ 'cmd/tstclnt/tstclnt.gyp:tstclnt', 'cmd/vfychain/vfychain.gyp:vfychain', 'cmd/vfyserv/vfyserv.gyp:vfyserv', + 'cmd/mpitests/mpitests.gyp:mpi_tests', 'gtests/certhigh_gtest/certhigh_gtest.gyp:certhigh_gtest', 'gtests/cryptohi_gtest/cryptohi_gtest.gyp:cryptohi_gtest', 'gtests/der_gtest/der_gtest.gyp:der_gtest', @@ -223,12 +224,6 @@ 'cmd/pkix-errcodes/pkix-errcodes.gyp:pkix-errcodes', ], }], - [ 'test_build==1', { - 'dependencies': [ - 'cmd/mpitests/mpitests.gyp:mpi_tests', - 'gtests/freebl_gtest/freebl_gtest.gyp:freebl_gtest', - ], - }], [ 'disable_fips==0', { 'dependencies': [ 'cmd/fipstest/fipstest.gyp:fipstest',