Skip to content
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

fix testenvSettings.sh #5306

Merged
merged 1 commit into from
May 9, 2024
Merged

fix testenvSettings.sh #5306

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
27 changes: 19 additions & 8 deletions scripts/testenv/testenvSettings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
#!/usr/bin/env bash
set +x
set -e

if [[ $USE_TESTENV_PROPERTIES == true ]]; then
if [ $USE_TESTENV_PROPERTIES = true ]; then
testenv_file="./testenv/testenv.properties"
if [[ "$PLATFORM" == *"zos"* ]]; then
testenv_file="./testenv/testenv_zos.properties"
fi
if [[ "$PLATFORM" == *"arm"* ]] && [[ "$JDK_VERSION" == "8" ]]; then
testenv_file="./testenv/testenv_arm32.properties"
fi
case "$PLATFORM" in
*zos*)
testenv_file="./testenv/testenv_zos.properties"
;;
*)
;;
esac
case "$PLATFORM" in
*arm*)
if [ "$JDK_VERSION" = "8" ]; then
testenv_file="./testenv/testenv_arm32.properties"
pshipton marked this conversation as resolved.
Show resolved Hide resolved
fi
;;
*)
;;
esac
while read line; do
export $line
done <$testenv_file
if [[ $JDK_IMPL == "openj9" ]] || [[ $JDK_IMPL == "ibm" ]]; then
if [ $JDK_IMPL = "openj9" ] || [ $JDK_IMPL = "ibm" ]; then
repo=JDK${JDK_VERSION}_OPENJ9_REPO
branch=JDK${JDK_VERSION}_OPENJ9_BRANCH

Expand Down