Skip to content

Commit bd66957

Browse files
committed
[I-Build-Test] Remove CPU-arch as criterion for testPlatform property
All usages depending on the 'testPlatform' variable don't distinguish between architectures. In case it is attempted to run the tests on a unsupported arch, checking the architecture too produces an explicit error message instead of just having a download that fails because the corresponding artifacts are not available. But those that run I-builds locally or configure a new platform are usually well aware if the executing architecture is supported or not. And testing for the arch just makes it more complicated to run tests on new platforms.
1 parent 3646ab6 commit bd66957

File tree

1 file changed

+1
-25
lines changed

1 file changed

+1
-25
lines changed

production/testScripts/runTests2.xml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,6 @@
199199
<equals
200200
arg1="${osgi.ws}"
201201
arg2="win32" />
202-
<or>
203-
<equals
204-
arg1="${osgi.arch}"
205-
arg2="x86_64" />
206-
</or>
207202
</and>
208203
</condition>
209204

@@ -217,17 +212,6 @@
217212
<equals
218213
arg1="${osgi.ws}"
219214
arg2="gtk" />
220-
<or>
221-
<equals
222-
arg1="${osgi.arch}"
223-
arg2="x86_64" />
224-
<equals
225-
arg1="${osgi.arch}"
226-
arg2="ppc64le" />
227-
<equals
228-
arg1="${osgi.arch}"
229-
arg2="aarch64" />
230-
</or>
231215
</and>
232216
</condition>
233217
<condition
@@ -240,14 +224,6 @@
240224
<equals
241225
arg1="${osgi.ws}"
242226
arg2="cocoa" />
243-
<or>
244-
<equals
245-
arg1="${osgi.arch}"
246-
arg2="x86_64" />
247-
<equals
248-
arg1="${osgi.arch}"
249-
arg2="aarch64" />
250-
</or>
251227
</and>
252228
</condition>
253229
<echo message="[DEBUG] in runTest2.xml: os ws arch ${osgi.os} ${osgi.ws} ${osgi.arch}" />
@@ -267,7 +243,7 @@
267243
use mirror URLs? (though, that'd not effect production) -->
268244
<fail
269245
unless="testPlatform"
270-
message="testPlatform did not match any of the supported combinations of osgi.os, osgi.ws, osgi.arch" />
246+
message="testPlatform did not match any of the supported combinations of osgi.os, osgi.ws" />
271247
<condition
272248
property="getArtifacts"
273249
value="getwinzips">

0 commit comments

Comments
 (0)