Skip to content

Commit 2325971

Browse files
committed
Fix tvOS test job
1 parent 68ab89b commit 2325971

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

.yamato/input-system-mobile-functional-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ inputsystem-mobilefunctionaltests_-_2021_3_-_tvos:
7777
type: Unity::mobile::appletv
7878
flavor: m1.mac
7979
commands:
80-
- command: UnifiedTestRunner --suite=playmode --platform=undefined --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
80+
- command: UnifiedTestRunner --suite=playmode --platform=tvOS --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
8181
after:
8282
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
8383
artifacts:
@@ -164,7 +164,7 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_tvos:
164164
type: Unity::mobile::appletv
165165
flavor: m1.mac
166166
commands:
167-
- command: UnifiedTestRunner --suite=playmode --platform=undefined --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
167+
- command: UnifiedTestRunner --suite=playmode --platform=tvOS --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
168168
after:
169169
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
170170
artifacts:
@@ -251,7 +251,7 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_tvos:
251251
type: Unity::mobile::appletv
252252
flavor: m1.mac
253253
commands:
254-
- command: UnifiedTestRunner --suite=playmode --platform=undefined --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
254+
- command: UnifiedTestRunner --suite=playmode --platform=tvOS --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
255255
after:
256256
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
257257
artifacts:
@@ -338,7 +338,7 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_tvos:
338338
type: Unity::mobile::appletv
339339
flavor: m1.mac
340340
commands:
341-
- command: UnifiedTestRunner --suite=playmode --platform=undefined --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
341+
- command: UnifiedTestRunner --suite=playmode --platform=tvOS --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
342342
after:
343343
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
344344
artifacts:
@@ -425,7 +425,7 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_tvos:
425425
type: Unity::mobile::appletv
426426
flavor: m1.mac
427427
commands:
428-
- command: UnifiedTestRunner --suite=playmode --platform=undefined --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
428+
- command: UnifiedTestRunner --suite=playmode --platform=tvOS --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
429429
after:
430430
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
431431
artifacts:

Tools/CI/Recipes/MobileFunctionalTests.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,31 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
113113

114114
if (platform.System == SystemType.Android)
115115
job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands);
116-
117-
job.WithCommands(c => c
116+
117+
if (platform.System == SystemType.TvOS)
118+
{
119+
job.WithCommands(c => c
120+
.Add(UtrCommand.Run(platform.System, b => b
121+
.WithSuite(UtrTestSuiteType.Playmode)
122+
.WithExtraArgs("--platform=tvOS")
123+
.WithCategory("!Performance")
124+
.WithRerun(1)
125+
.WithPlayerLoadPath("build/players")
126+
.WithArtifacts("build/test-results"))));
127+
}
128+
else
129+
{
130+
job.WithCommands(c => c
118131
.Add(UtrCommand.Run(platform.System, b => b
119132
.WithSuite(UtrTestSuiteType.Playmode)
120133
.WithPlatform(platform.System)
121134
.WithCategory("!Performance")
122135
.WithRerun(1)
123136
.WithPlayerLoadPath("build/players")
124-
.WithArtifacts("build/test-results"))))
125-
.WithDependencies(buildJob)
137+
.WithArtifacts("build/test-results"))));
138+
}
139+
140+
job.WithDependencies(buildJob)
126141
.WithArtifact(new Artifact("logs", "build/test-results/**/*"))
127142
.WithInfrastructureInstabilityDetection<WrenchExtensions.CustomScriptInfo>();
128143

0 commit comments

Comments
 (0)