Ensure we don't pick up static-libs instead of JDK for testing

adoptium · Jan 10, 2022 · bd19256 · bd19256
1 parent 8a2584a
commit bd19256
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ansible/pbTestScripts/testJDK.sh b/ansible/pbTestScripts/testJDK.sh
@@ -6,9 +6,12 @@ if [[ $(uname) == "FreeBSD" ]]; then
 	cp -r $HOME/openjdk-build/workspace/build/src/build/*/jdk* $HOME
 	export TEST_JDK_HOME=$HOME/jdk
 else
-	export TEST_JDK_HOME=$(find $HOME/openjdk-build/workspace/build/src/build/*/images/ -maxdepth 1 -type d -name "jdk*"|grep -v ".*jre.*"|grep -v ".*-image")
+	ls -ld $HOME/openjdk-build/workspace/build/src/build/*/images/jdk*
+ 	export TEST_JDK_HOME=$(ls -1d $HOME/openjdk-build/workspace/build/src/build/*/images/jdk* |egrep -v 'jre|-image|static-libs'
 fi
 
+echo DEBUG: TEST_JDK_HOME = $TEST_JDK_HOME
+
 mkdir -p $HOME/testLocation
 [ ! -d $HOME/testLocation/aqa-tests ] && git clone https://github.com/adoptium/aqa-tests.git $HOME/testLocation/aqa-tests
 # cd to aqa-tests as required by https://github.com/adoptium/aqa-tests/issues/2691#issue-932959102