Skip to content

Commit 646b6b5

Browse files
vieirojerboaa
authored andcommitted
8360816: [11u] Use default value for ProgramFiles(x86) in GHA
Reviewed-by: sgehwolf
1 parent 0927ca7 commit 646b6b5

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,16 @@ jobs:
143143
echo "value=$PATH" >> $GITHUB_OUTPUT
144144
fi
145145
146+
- name: 'Set JTReg Options'
147+
id: jtreg-options
148+
run: |
149+
if [[ '${{ runner.os }}' == 'Windows' ]]; then
150+
# JTReg option for 'ProgramFiles(x86)' environment variable
151+
echo 'value=-e:ProgramFiles\(x86\)=C:\\Program\ Files\ \(x86\)' >> $GITHUB_OUTPUT
152+
else
153+
echo 'value=' >> $GITHUB_OUTPUT
154+
fi
155+
146156
- name: 'Run tests'
147157
id: run-tests
148158
run: >
@@ -153,7 +163,7 @@ jobs:
153163
JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
154164
SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
155165
TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
156-
JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
166+
JTREG='OPTIONS=${{ steps.jtreg-options.outputs.value }};JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
157167
&& bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
158168
env:
159169
PATH: ${{ steps.path.outputs.value }}

0 commit comments

Comments
 (0)