Revert to using MachineInfo test

adoptium · Jan 6, 2022 · 712ae49 · 712ae49
1 parent 0d9dca7
commit 712ae49
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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