Skip to content

Commit c3683b0

Browse files
authored
Rename 'excludemonofailures' to 'mono' (#62749)
1 parent 5f9a532 commit c3683b0

File tree

7 files changed

+14
-9
lines changed

7 files changed

+14
-9
lines changed

docs/workflow/testing/mono/testing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ To build the runtime tests for Mono JIT or interpreter:
1717

1818
```
1919
cd src/tests
20-
./build.sh excludemonofailures <release|debug>
20+
./build.sh mono <release|debug>
2121
```
2222

2323
To build an individual test, test directory, or a whole subdirectory tree, use the `-test:`, `-dir:` or `-tree:` options (without the src/tests prefix)
24-
For example: `./build.sh excludemonofailures release -test:JIT/opt/InstructionCombining/DivToMul.csproj`
24+
For example: `./build.sh mono release -test:JIT/opt/InstructionCombining/DivToMul.csproj`
2525

2626

2727
Run individual test:
@@ -47,7 +47,7 @@ bash ./artifacts/tests/coreclr/OSX.x64.Release/JIT/opt/InstructionCombining/DivT
4747
### WebAssembly:
4848
Build the runtime tests for WebAssembly
4949
```
50-
$(REPO_ROOT)/src/tests/build.sh -excludemonofailures os Browser wasm <Release/Debug>
50+
$(REPO_ROOT)/src/tests/build.sh -mono os Browser wasm <Release/Debug>
5151
```
5252

5353
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.
6464
### Android:
6565
Build the runtime tests for Android x64/ARM64
6666
```
67-
$(REPO_ROOT)/src/tests/build.sh -excludemonofailures os Android <x64/arm64> <Release/Debug>
67+
$(REPO_ROOT)/src/tests/build.sh -mono os Android <x64/arm64> <Release/Debug>
6868
```
6969

7070
Run one test wrapper from repo root

eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ parameters:
2626

2727

2828
steps:
29-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper)
29+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper)
3030
displayName: Build Tests
3131

3232
# Send tests to Helix

eng/pipelines/common/templates/runtimes/build-test-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494

9595
- ${{ if eq(parameters.runtimeFlavor, 'mono') }}:
9696
- name: runtimeFlavorArgs
97-
value: '-excludemonofailures'
97+
value: '-mono'
9898

9999
steps:
100100

eng/pipelines/common/templates/runtimes/run-test-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101

102102
- ${{ if eq(parameters.runtimeFlavor, 'mono') }}:
103103
- name: runtimeFlavorArgs
104-
value: '-excludemonofailures'
104+
value: '-mono'
105105

106106
- name: runtimeVariantArg
107107
value: ''

eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ parameters:
3232

3333

3434
steps:
35-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=monointerpreter /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os Browser wasm $(buildConfigUpper)
35+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=monointerpreter /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os Browser wasm $(buildConfigUpper)
3636
displayName: Build Tests
3737

3838
# Send tests to Helix

src/tests/build.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!proce
122122
if /i "%1" == "-priority" (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
123123
if /i "%1" == "allTargets" (set "__BuildNeedTargetArg=/p:CLRTestBuildAllTargets=%1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
124124
if /i "%1" == "-excludemonofailures" (set __Mono=1&set processedArgs=!processedArgs!&shift&goto Arg_Loop)
125+
if /i "%1" == "-mono" (set __Mono=1&set processedArgs=!processedArgs!&shift&goto Arg_Loop)
125126
if /i "%1" == "--" (set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
126127

127128
if [!processedArgs!]==[] (

src/tests/build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ usage_list+=("-allTargets: Build managed tests for all target platforms (includi
157157

158158
usage_list+=("-rebuild: if tests have already been built - rebuild them.")
159159
usage_list+=("-runtests: run tests after building them.")
160-
usage_list+=("-excludemonofailures: Mark the build as running on Mono runtime so that mono-specific issues are honored.")
160+
usage_list+=("-mono: Build the tests for the Mono runtime honoring mono-specific issues.")
161161

162162
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.")
163163

@@ -248,6 +248,10 @@ handle_arguments_local() {
248248
__Mono=1
249249
;;
250250

251+
mono|-mono)
252+
__Mono=1
253+
;;
254+
251255
mono_aot|-mono_aot)
252256
__Mono=1
253257
__MonoAot=1

0 commit comments

Comments
 (0)