Skip to content

Commit 490ad11

Browse files
authored
pbTests: Fix Issue With Windows VPC Not Running Tests (#2790)
* Fix case sensitive switch on windows * Test - Set Home Dir Explicitly * TEST - Override Home Path * Remove Test Home Override * Change paths to not use HOME env variable * Fix pathing and naming issues in windows test run. * Fix Test JDK Home Path * Update Paths For Java * Windowsify TEST_JDK_HOME path environment variable
1 parent 3eac4bc commit 490ad11

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

ansible/pbTestScripts/testJDKWin.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
#!/bin/bash
22

3-
# Script to execute System tests on the previously built JDK.
3+
# Relocate Built JDKS
4+
mv /cygdrive/c/tmp/workspace/build/src/build/*/images/jdk* c:/tmp
45

5-
mv /cygdrive/c/tmp/workspace/build/src/build/*/images/jdk* $HOME
6-
# Ensures to set it to the JDK, not JRE or different images
7-
export TEST_JDK_HOME=C:/cygwin64$(find ~ -maxdepth 1 -type d -name "*jdk*"|grep -v ".*jre"| grep -v ".*-image")
6+
# Remove Redundant Images
7+
rm -rf /cygdrive/c/tmp/*-debug-image
8+
rm -rf /cygdrive/c/tmp/*-jre
9+
rm -rf /cygdrive/c/tmp/*-test-image
810

9-
cd $HOME
11+
#Identify The JDK
12+
13+
# Set Test JDK HOME To The Relocated JDK
14+
# export TEST_JDK_HOME=C:/cygwin64$(find ~ -maxdepth 1 -type d -name "*jdk*"|grep -v ".*jre"| grep -v ".*-image")
15+
export TEST_JDK_HOME=`ls -d c:/tmp/jdk*|grep -v "static"|grep -v "debug"|grep -v "jre"|grep -v "test-image"`
16+
echo TEST_JDK_HOME=$TEST_JDK_HOME
17+
18+
cd /cygdrive/c/tmp
1019
if [ ! -d "testLocation" ];
1120
then
1221
echo "Creating testLocation directory"
@@ -20,7 +29,7 @@ then
2029
fi
2130
cd openjdk-tests
2231

23-
./get.sh -t $HOME/testLocation/openjdk-tests -p x64_windows
32+
./get.sh -T $HOME/testLocation/openjdk-tests -p x64_windows
2433
cd TKG
2534
export BUILD_LIST=system
2635
make compile

0 commit comments

Comments
 (0)