From c3683b06b0752e71284f0bc76d0711f28f5ef608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Tue, 14 Dec 2021 07:38:55 +0100 Subject: [PATCH] Rename 'excludemonofailures' to 'mono' (#62749) --- docs/workflow/testing/mono/testing.md | 8 ++++---- .../runtimes/android-runtime-and-send-to-helix.yml | 2 +- .../common/templates/runtimes/build-test-job.yml | 2 +- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- .../templates/runtimes/wasm-runtime-and-send-to-helix.yml | 2 +- src/tests/build.cmd | 1 + src/tests/build.sh | 6 +++++- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/workflow/testing/mono/testing.md b/docs/workflow/testing/mono/testing.md index 7d34ee1a7b0..41cdad477fd 100644 --- a/docs/workflow/testing/mono/testing.md +++ b/docs/workflow/testing/mono/testing.md @@ -17,11 +17,11 @@ To build the runtime tests for Mono JIT or interpreter: ``` cd src/tests -./build.sh excludemonofailures +./build.sh mono ``` To build an individual test, test directory, or a whole subdirectory tree, use the `-test:`, `-dir:` or `-tree:` options (without the src/tests prefix) -For example: `./build.sh excludemonofailures release -test:JIT/opt/InstructionCombining/DivToMul.csproj` +For example: `./build.sh mono release -test:JIT/opt/InstructionCombining/DivToMul.csproj` Run individual test: @@ -47,7 +47,7 @@ bash ./artifacts/tests/coreclr/OSX.x64.Release/JIT/opt/InstructionCombining/DivT ### WebAssembly: Build the runtime tests for WebAssembly ``` -$(REPO_ROOT)/src/tests/build.sh -excludemonofailures os Browser wasm +$(REPO_ROOT)/src/tests/build.sh -mono os Browser wasm ``` The last few lines of the build log should contain something like this: @@ -64,7 +64,7 @@ To run all tests, execute that command, adding `wasm` to the end. ### Android: Build the runtime tests for Android x64/ARM64 ``` -$(REPO_ROOT)/src/tests/build.sh -excludemonofailures os Android +$(REPO_ROOT)/src/tests/build.sh -mono os Android ``` Run one test wrapper from repo root diff --git a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml index f42787af8eb..2e883dc9a6c 100644 --- a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml @@ -26,7 +26,7 @@ parameters: steps: - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper) + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper) displayName: Build Tests # Send tests to Helix diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index f7cc7202d2a..b05315fc785 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -94,7 +94,7 @@ jobs: - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: runtimeFlavorArgs - value: '-excludemonofailures' + value: '-mono' steps: diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 4776d80eaec..baba1468e5e 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -101,7 +101,7 @@ jobs: - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: runtimeFlavorArgs - value: '-excludemonofailures' + value: '-mono' - name: runtimeVariantArg value: '' diff --git a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml index 2e9fa6d8525..6dd5f6b858b 100644 --- a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml @@ -32,7 +32,7 @@ parameters: steps: - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=monointerpreter /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os Browser wasm $(buildConfigUpper) + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=monointerpreter /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os Browser wasm $(buildConfigUpper) displayName: Build Tests # Send tests to Helix diff --git a/src/tests/build.cmd b/src/tests/build.cmd index b26cd803418..e0a981bef8f 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -122,6 +122,7 @@ if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!proce if /i "%1" == "-priority" (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop) if /i "%1" == "allTargets" (set "__BuildNeedTargetArg=/p:CLRTestBuildAllTargets=%1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-excludemonofailures" (set __Mono=1&set processedArgs=!processedArgs!&shift&goto Arg_Loop) +if /i "%1" == "-mono" (set __Mono=1&set processedArgs=!processedArgs!&shift&goto Arg_Loop) if /i "%1" == "--" (set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if [!processedArgs!]==[] ( diff --git a/src/tests/build.sh b/src/tests/build.sh index 35a309242f2..83c1020f7ee 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -157,7 +157,7 @@ usage_list+=("-allTargets: Build managed tests for all target platforms (includi usage_list+=("-rebuild: if tests have already been built - rebuild them.") usage_list+=("-runtests: run tests after building them.") -usage_list+=("-excludemonofailures: Mark the build as running on Mono runtime so that mono-specific issues are honored.") +usage_list+=("-mono: Build the tests for the Mono runtime honoring mono-specific issues.") usage_list+=("-log: base file name to use for log files (used in lab pipelines that build tests in multiple steps to retain logs for each step.") @@ -248,6 +248,10 @@ handle_arguments_local() { __Mono=1 ;; + mono|-mono) + __Mono=1 + ;; + mono_aot|-mono_aot) __Mono=1 __MonoAot=1 -- GitLab