Skip to content

[I-Build-Test] Remove CPU-arch as criterion for testPlatform property #2487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2024
Merged

[I-Build-Test] Remove CPU-arch as criterion for testPlatform property #2487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions production/testScripts/runTests2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,6 @@
<equals
arg1="${osgi.ws}"
arg2="win32" />
<or>
<equals
arg1="${osgi.arch}"
arg2="x86_64" />
</or>
</and>
</condition>

Expand All @@ -217,17 +212,6 @@
<equals
arg1="${osgi.ws}"
arg2="gtk" />
<or>
<equals
arg1="${osgi.arch}"
arg2="x86_64" />
<equals
arg1="${osgi.arch}"
arg2="ppc64le" />
<equals
arg1="${osgi.arch}"
arg2="aarch64" />
</or>
</and>
</condition>
<condition
Expand All @@ -240,14 +224,6 @@
<equals
arg1="${osgi.ws}"
arg2="cocoa" />
<or>
<equals
arg1="${osgi.arch}"
arg2="x86_64" />
<equals
arg1="${osgi.arch}"
arg2="aarch64" />
</or>
</and>
</condition>
<echo message="[DEBUG] in runTest2.xml: os ws arch ${osgi.os} ${osgi.ws} ${osgi.arch}" />
Expand All @@ -267,7 +243,7 @@
use mirror URLs? (though, that'd not effect production) -->
<fail
unless="testPlatform"
message="testPlatform did not match any of the supported combinations of osgi.os, osgi.ws, osgi.arch" />
message="testPlatform did not match any of the supported combinations of osgi.os, osgi.ws" />
<condition
property="getArtifacts"
value="getwinzips">
Expand Down