diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-11-12 02:37:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-12 02:37:11 +0300 |
commit | 5d2525527ef827f9ad669a8a32c36c05bce1d843 (patch) | |
tree | 32eb352a0e557bcc9433cc6d0e694e6ddd8b767d /scripts/ci | |
parent | 95a26ebff9d20be9d5dd51b5d9a79c8e27516944 (diff) |
Add common "test" target for precompiling test assemblies (#11622)
So we can precompile all tests across the repo using a simple "make test" in the root.
Diffstat (limited to 'scripts/ci')
-rwxr-xr-x | scripts/ci/run-jenkins.sh | 6 | ||||
-rwxr-xr-x | scripts/ci/run-test-acceptance-tests.sh | 2 | ||||
-rwxr-xr-x | scripts/ci/run-test-default.sh | 8 | ||||
-rwxr-xr-x | scripts/ci/run-test-interpreter.sh | 4 | ||||
-rwxr-xr-x | scripts/ci/run-test-mac-sdk.sh | 2 | ||||
-rwxr-xr-x | scripts/ci/run-test-stress-tests.sh | 2 | ||||
-rwxr-xr-x | scripts/ci/run-test-testing_aot_full.sh | 2 | ||||
-rwxr-xr-x | scripts/ci/run-test-testing_aot_full_interp.sh | 2 | ||||
-rwxr-xr-x | scripts/ci/run-test-testing_aot_hybrid.sh | 2 | ||||
-rwxr-xr-x | scripts/ci/run-test-winaot.sh | 2 |
10 files changed, 17 insertions, 15 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 696354979e4..1b2eda871ee 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -2,11 +2,13 @@ export MONO_REPO_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )" export TESTCMD=${MONO_REPO_ROOT}/scripts/ci/run-step.sh - +export CI=1 +export CI_PR=$([[ ${CI_TAGS} == *'pull-request'* ]] && echo 1 || true) export CI_CPU_COUNT=$(getconf _NPROCESSORS_ONLN || echo 4) - export TEST_HARNESS_VERBOSE=1 +source ${MONO_REPO_ROOT}/scripts/ci/util.sh + make_timeout=300m if [[ ${CI_TAGS} == *'clang-sanitizer'* ]]; then diff --git a/scripts/ci/run-test-acceptance-tests.sh b/scripts/ci/run-test-acceptance-tests.sh index 47965366ee3..408d4d63e02 100755 --- a/scripts/ci/run-test-acceptance-tests.sh +++ b/scripts/ci/run-test-acceptance-tests.sh @@ -22,4 +22,4 @@ ${TESTCMD} --label=coreclr-runtest-basic --timeout=20m make -C acceptance-tests ${TESTCMD} --label=coreclr-runtest-coremanglib --timeout=10m make -C acceptance-tests coreclr-runtest-coremanglib # run the GC stress tests (on PRs we only run a short version) -${TESTCMD} --label=coreclr-gcstress --timeout=1200m make -C acceptance-tests coreclr-gcstress CI_PR=$([[ ${CI_TAGS} == *'pull-request'* ]] && echo 1 || true) +${TESTCMD} --label=coreclr-gcstress --timeout=1200m make -C acceptance-tests coreclr-gcstress diff --git a/scripts/ci/run-test-default.sh b/scripts/ci/run-test-default.sh index b6bbf80fe31..312ea53cf7d 100755 --- a/scripts/ci/run-test-default.sh +++ b/scripts/ci/run-test-default.sh @@ -1,5 +1,7 @@ #!/bin/bash -e +source ${MONO_REPO_ROOT}/scripts/ci/util.sh + ${TESTCMD} --label=mini --timeout=5m make -w -C mono/mini -k check check-seq-points EMIT_NUNIT=1 if [[ ${CI_TAGS} == *'win-'* ]] then ${TESTCMD} --label=mini-aotcheck --skip; @@ -10,8 +12,8 @@ then ${TESTCMD} --label=aot-test --skip; else ${TESTCMD} --label=aot-test --timeout=30m make -w -C mono/tests -j ${CI_CPU_COUNT} -k test-aot fi ${TESTCMD} --label=compile-bcl-tests --timeout=40m make -i -w -C runtime -j ${CI_CPU_COUNT} test xunit-test -${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j ${CI_CPU_COUNT} tests -${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1 CI_PR=$([[ ${CI_TAGS} == *'pull-request'* ]] && echo 1 || true) +${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j ${CI_CPU_COUNT} test +${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 ${TESTCMD} --label=runtime-unit-tests --timeout=5m make -w -C mono/unit-tests -k check if [[ ${CI_TAGS} == *'osx-'* ]]; then ${TESTCMD} --label=corlib-btls --timeout=5m bash -c "export MONO_TLS_PROVIDER=btls && make -w -C mcs/class/corlib TEST_HARNESS_FLAGS=-include:X509Certificates run-test"; fi ${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test @@ -141,7 +143,6 @@ fi ${TESTCMD} --label=bundle-test-results --timeout=2m find . -name "TestResult*.xml" -exec tar -rvf TestResults.tar {} \; if [[ $CI_TAGS == *'apidiff'* ]]; then - source ${MONO_REPO_ROOT}/scripts/ci/util.sh if ${TESTCMD} --label=apidiff --timeout=15m --fatal make -w -C mcs -j ${CI_CPU_COUNT} mono-api-diff then report_github_status "success" "API Diff" "No public API changes found." || true else report_github_status "error" "API Diff" "The public API changed." "$BUILD_URL/Public_20API_20Diff/" || true @@ -149,7 +150,6 @@ if [[ $CI_TAGS == *'apidiff'* ]]; then else ${TESTCMD} --label=apidiff --skip fi if [[ $CI_TAGS == *'csprojdiff'* ]]; then - source ${MONO_REPO_ROOT}/scripts/ci/util.sh make update-solution-files if ${TESTCMD} --label=csprojdiff --timeout=5m --fatal make -w -C mcs mono-csproj-diff then report_github_status "success" "Project Files Diff" "No csproj file changes found." || true diff --git a/scripts/ci/run-test-interpreter.sh b/scripts/ci/run-test-interpreter.sh index 982694b2405..15feabf21f5 100755 --- a/scripts/ci/run-test-interpreter.sh +++ b/scripts/ci/run-test-interpreter.sh @@ -6,8 +6,8 @@ export TEST_WITH_INTERPRETER=1 ${TESTCMD} --label=interpreter-regression --timeout=10m make -C mono/mini richeck ${TESTCMD} --label=mixedmode-regression --timeout=10m make -C mono/mini mixedcheck ${TESTCMD} --label=fullaotmixed-regression --timeout=10m make -C mono/mini fullaotmixedcheck -${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j ${CI_CPU_COUNT} tests -${TESTCMD} --label=runtime-interp --timeout=160m make -w -C mono/tests -k testinterp V=1 CI=1 CI_PR=$([[ ${CI_TAGS} == *'pull-request'* ]] && echo 1 || true) +${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j ${CI_CPU_COUNT} test +${TESTCMD} --label=runtime-interp --timeout=160m make -w -C mono/tests -k testinterp V=1 ${TESTCMD} --label=corlib --timeout=160m make -w -C mcs/class/corlib run-test V=1 ${TESTCMD} --label=System --timeout=160m bash -c "export MONO_TLS_PROVIDER=legacy && make -w -C mcs/class/System run-test V=1" ${TESTCMD} --label=System.Core --timeout=160m make -w -C mcs/class/System.Core run-test V=1 diff --git a/scripts/ci/run-test-mac-sdk.sh b/scripts/ci/run-test-mac-sdk.sh index d9a34c0836a..7d38e06f65b 100755 --- a/scripts/ci/run-test-mac-sdk.sh +++ b/scripts/ci/run-test-mac-sdk.sh @@ -12,7 +12,7 @@ zip ${MONO_REPO_ROOT}/msbuild-test-results.zip artifacts/2/Release-MONO/TestResu # Bundled LLVM cd ${MONO_REPO_ROOT}/external/bockbuild/builds/mono -${TESTCMD} --label="runtime-tests-llvm" --timeout=240m make -C mono/tests -k test-wrench MONO_ENV_OPTIONS=--llvm V=1 CI=1 M=1 +${TESTCMD} --label="runtime-tests-llvm" --timeout=240m make -C mono/tests -k test-wrench MONO_ENV_OPTIONS=--llvm V=1 M=1 ${TESTCMD} --label="corlib-tests-llvm" --timeout=60m make -C mcs/class/corlib run-test PLATFORM_TEST_HARNESS_EXCLUDES=NotOnMac,MacNotWorking,LLVMNotWorking, MONO_ENV_OPTIONS=--llvm # Bundled libgdiplus diff --git a/scripts/ci/run-test-stress-tests.sh b/scripts/ci/run-test-stress-tests.sh index 87c1cdc7c10..6227f9b6108 100755 --- a/scripts/ci/run-test-stress-tests.sh +++ b/scripts/ci/run-test-stress-tests.sh @@ -1,3 +1,3 @@ #!/bin/bash -e -${TESTCMD} --label=check-stress --timeout=12h make -w -C mono/tests -k check-stress V=1 CI=1 +${TESTCMD} --label=check-stress --timeout=12h make -w -C mono/tests -k check-stress V=1 diff --git a/scripts/ci/run-test-testing_aot_full.sh b/scripts/ci/run-test-testing_aot_full.sh index b9ca4fe4530..92b9e2e4d88 100755 --- a/scripts/ci/run-test-testing_aot_full.sh +++ b/scripts/ci/run-test-testing_aot_full.sh @@ -12,7 +12,7 @@ else ${TESTCMD} --label=mini --timeout=25m make -j ${CI_CPU_COUNT} -w -C mono/mini -k fullaotcheck fi -${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1 +${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 ${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test ${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall ${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check diff --git a/scripts/ci/run-test-testing_aot_full_interp.sh b/scripts/ci/run-test-testing_aot_full_interp.sh index 07abf7e501c..37e20e9608f 100755 --- a/scripts/ci/run-test-testing_aot_full_interp.sh +++ b/scripts/ci/run-test-testing_aot_full_interp.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k testfullaotinterp V=1 CI=1 +${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k testfullaotinterp V=1 # FIXME #${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test diff --git a/scripts/ci/run-test-testing_aot_hybrid.sh b/scripts/ci/run-test-testing_aot_hybrid.sh index 1c9c8649437..60762717cd1 100755 --- a/scripts/ci/run-test-testing_aot_hybrid.sh +++ b/scripts/ci/run-test-testing_aot_hybrid.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ${TESTCMD} --label=mini --timeout=25m make -j ${CI_CPU_COUNT} -w -C mono/mini -k aotcheck -${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1 +${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 ${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test ${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall ${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check diff --git a/scripts/ci/run-test-winaot.sh b/scripts/ci/run-test-winaot.sh index 4aa2902d77d..6162eed65c0 100755 --- a/scripts/ci/run-test-winaot.sh +++ b/scripts/ci/run-test-winaot.sh @@ -7,7 +7,7 @@ else ${TESTCMD} --label=mini --timeout=25m make -j ${CI_CPU_COUNT} -w -C mono/mini -k fullaotcheck fi -${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1 +${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 ${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test ${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall ${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check |