From 712ae4906d55fb2bc500b31eb7f4affc1f1b5225 Mon Sep 17 00:00:00 2001 From: Willsparker Date: Thu, 6 Jan 2022 12:28:28 +0000 Subject: [PATCH] Revert to using MachineInfo test --- ansible/pbTestScripts/testJDK.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/pbTestScripts/testJDK.sh b/ansible/pbTestScripts/testJDK.sh index 842432de5b..2a3abfd3d9 100755 --- a/ansible/pbTestScripts/testJDK.sh +++ b/ansible/pbTestScripts/testJDK.sh @@ -1,7 +1,7 @@ #!/bin/bash export MAKE_COMMAND="make" -if [[ $(uname) == "FreeBSD" ]]; then +if [[ "$(uname)" == "FreeBSD" ]]; then export MAKE_COMMAND="gmake" cp -r $HOME/openjdk-build/workspace/build/src/build/*/jdk* $HOME export TEST_JDK_HOME=$HOME/jdk @@ -12,7 +12,7 @@ else fi # Special case for Solaris. See: https://github.com/adoptium/infrastructure/pull/2405#issuecomment-999498345 -if [[ $(uname) == "SunOS" ]]; then +if [[ "$(uname)" == "SunOS" ]]; then export PATH="/opt/csw/bin:/usr/local/bin:${PATH}" fi @@ -26,10 +26,10 @@ cd $HOME/testLocation/aqa-tests/TKG || exit 1 # Solaris runs a different test to Linux. # See: https://adoptium.slack.com/archives/C53GHCXL4/p1641311568115100?thread_ts=1641296204.114900&cid=C53GHCXL4 -if [[ $(uname) == "SunOS" ]]; then - export BUILD_LIST=openjdk +if [[ "$(uname)" == "SunOS" ]]; then + export BUILD_LIST=system $MAKE_COMMAND compile - $MAKE_COMMAND _jdk_math + $MAKE_COMMAND _MachineInfo else # Runs this test to check for prerequisite perl modules export BUILD_LIST=functional