fix testenvSettings.sh #5306
Merged
fix testenvSettings.sh #5306
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
@keithc-ca can you pls review this. |
pshipton
reviewed
May 9, 2024
|
arm_linux JDK11: https://ci.adoptium.net/view/Test_grinder/job/Grinder/9905/console |
keithc-ca
suggested changes
May 9, 2024
scripts/testenv/testenvSettings.sh
Outdated
Comment on lines
6
to
16
| case "$PLATFORM" in | ||
| *zos*) | ||
| testenv_file="./testenv/testenv_zos.properties" | ||
| ;; | ||
| *arm*) | ||
| if [ "$JDK_VERSION" = "8" ]; then |
There was a problem hiding this comment.
This yields different behavior for a platform matching both *zos* and *arm*. I'm not sure we have any of those, but to be equivalent, we would express this as two sequential case statements.
scripts/testenv/testenvSettings.sh
Outdated
Comment on lines
14
to
18
| testenv_file="./testenv/testenv.properties" | ||
| fi | ||
| ;; | ||
| *) | ||
| testenv_file="./testenv/testenv.properties" |
There was a problem hiding this comment.
Rather than repeat the default, perhaps it should be set at the beginning like the previous code.
scripts/testenv/testenvSettings.sh
Outdated
| ;; | ||
| *) | ||
| testenv_file="./testenv/testenv.properties" | ||
| ;; |
There was a problem hiding this comment.
nit: This should be indented the same as lines 16 and 18.
llxia
force-pushed
the
mytest
branch
2 times, most recently
from
a2cf062 to
9423aa1
Compare
pshipton
reviewed
May 9, 2024
pshipton
approved these changes
May 9, 2024
keithc-ca
reviewed
May 9, 2024
scripts/testenv/testenvSettings.sh
Outdated
Comment on lines
7
to
22
| case "$PLATFORM" in | ||
| *zos*) | ||
| testenv_file="./testenv/testenv_zos.properties" | ||
| ;; | ||
| *arm*) | ||
| case "$JDK_VERSION" in | ||
| "8") | ||
| testenv_file="./testenv/testenv_arm32.properties" | ||
| ;; | ||
| esac | ||
| ;; | ||
| esac |
There was a problem hiding this comment.
This isn't what I meant by "two sequential case statements" (this is just more verbose than the earlier version).
What I meant was:
testenv_file="./testenv/testenv.properties"
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"
fi
;;
*)
;;
esac
Again, this is only relevant for platforms matching *arm*zos* or *zos*arm* (which may never materialize).
fix: adoptium#5305 and adoptium#5301 Signed-off-by: Lan Xia <[email protected]>
keithc-ca
approved these changes
May 9, 2024
llxia
added a commit
to llxia/aqa-tests
that referenced
this pull request
May 9, 2024
fix: adoptium#5305 and adoptium#5301 Signed-off-by: Lan Xia <[email protected]>
pshipton
pushed a commit
that referenced
this pull request
May 9, 2024
fix: #5305 and #5301 Signed-off-by: Lan Xia <[email protected]>
|
tyvm! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix: #5305 and #5301