Skip to content

Commit 3203778

Browse files
committed
Corrected mobile scripting backends
1 parent 2a4dcf5 commit 3203778

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

.yamato/mobile-standalone-test.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
{% for project in projects.default -%}
88
{% for editor in validation_editors.all -%}
99
{% for platform in test_platforms.mobile_build -%}
10-
{% for backend in scripting_backends -%}
11-
build_{{ project.name }}_{{ editor }}_{{ platform.name }}_{{ backend }}:
12-
name: Build {{ project.name }} - [{{ editor }}, {{ platform.name }}, {{ backend }}]
10+
build_{{ project.name }}_{{ editor }}_{{ platform.name }}:
11+
name: Build {{ project.name }} - [{{ editor }}, {{ platform.name }}]
1312
agent:
1413
type: {{ platform.type }}
1514
image: {{ platform.image }}
@@ -23,11 +22,11 @@ build_{{ project.name }}_{{ editor }}_{{ platform.name }}_{{ backend }}:
2322
{% if platform.name == "Android" %}
2423
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
2524
- python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform {{ platform.name }}
26-
- utr.bat --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --build-only --timeout=1800 --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
25+
- utr.bat --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --timeout=1800 --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
2726
{% else %}
2827
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
2928
- chmod +x ./utr
30-
- ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --suite=playmode --platform={{ platform.standalone }} --scripting-backend={{ backend }} --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
29+
- ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --suite=playmode --platform={{ platform.standalone }} --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
3130
{% endif %}
3231

3332
artifacts:
@@ -49,16 +48,14 @@ build_{{ project.name }}_{{ editor }}_{{ platform.name }}_{{ backend }}:
4948
{% endfor -%}
5049
{% endfor -%}
5150
{% endfor -%}
52-
{% endfor -%}
5351

5452

5553
{% for project in projects.default -%}
5654
{% for editor in validation_editors.all -%}
5755
{% for platform in test_platforms.mobile_test -%}
5856
{% if platform.name == "Android" -%}
59-
{% for backend in scripting_backends -%}
60-
run_{{ project.name }}_tests_{{ editor }}_Android_{{ backend }}:
61-
name: Run {{ project.name }} Tests - [{{ editor }}, Android, {{ backend }}]
57+
run_{{ project.name }}_tests_{{ editor }}_Android:
58+
name: Run {{ project.name }} Tests - [{{ editor }}, Android, mono]
6259
agent:
6360
type: {{ platform.type }}
6461
image: {{ platform.image }}
@@ -73,7 +70,7 @@ run_{{ project.name }}_tests_{{ editor }}_Android_{{ backend }}:
7370
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
7471
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
7572
# Run the tests on the device
76-
- ./utr --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-load-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --reruncount=1 --player-connection-ip=%BOKKEN_HOST_IP% --testfilter=Unity.Netcode.RuntimeTests
73+
- ./utr --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-load-path=build/players --artifacts_path=build/logs --scripting-backend=mono --reruncount=1 --player-connection-ip=%BOKKEN_HOST_IP% --testfilter=Unity.Netcode.RuntimeTests
7774
artifacts:
7875
logs:
7976
paths:
@@ -88,20 +85,18 @@ run_{{ project.name }}_tests_{{ editor }}_Android_{{ backend }}:
8885
- build/players/**
8986
dependencies:
9087
- .yamato/mobile-standalone-test.yml#build_{{ project.name }}_{{ editor }}_Android
91-
{% endfor -%}
9288
{% endif -%}
9389
{% endfor -%}
9490
{% endfor -%}
9591
{% endfor -%}
9692

97-
93+
# iOS only supports Il2cpp scripting backend
9894
{% for project in projects.default -%}
9995
{% for editor in validation_editors.all -%}
10096
{% for platform in test_platforms.mobile_build -%}
10197
{% if platform.name == "iOS" -%}
102-
{% for backend in scripting_backends -%}
103-
run_{{ project.name }}_tests_{{ editor }}_iOS_{{ backend }}:
104-
name: Run {{ project.name }} Tests - [{{ editor }}, iOS, {{ backend }}]
98+
run_{{ project.name }}_tests_{{ editor }}_iOS:
99+
name: Run {{ project.name }} Tests - [{{ editor }}, iOS, Il2cpp]
105100
agent:
106101
type: {{ platform.type }}
107102
image: {{ platform.image }}
@@ -112,7 +107,7 @@ run_{{ project.name }}_tests_{{ editor }}_iOS_{{ backend }}:
112107
# Give UTR execution permissions
113108
- chmod +x ./utr
114109
# Run the tests on the device
115-
- ./utr -artifacts_path=artifacts --testproject={{ project.path }} --scripting-backend={{ backend }} --editor-location=.Editor --reruncount=1 --suite=playmode --platform=iOS --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
110+
- ./utr -artifacts_path=artifacts --testproject={{ project.path }} --editor-location=.Editor --reruncount=1 --suite=playmode --platform=iOS --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
116111
artifacts:
117112
logs:
118113
paths:
@@ -128,7 +123,6 @@ run_{{ project.name }}_tests_{{ editor }}_iOS_{{ backend }}:
128123
# Set a dependency on the build job
129124
dependencies:
130125
- .yamato/mobile-standalone-test.yml#build_{{ project.name }}_{{ editor }}_iOS
131-
{% endfor -%}
132126
{% endif -%}
133127
{% endfor -%}
134128
{% endfor -%}

0 commit comments

Comments
 (0)