aboutsummaryrefslogtreecommitdiff
path: root/jdkX-build-image.yaml
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2019-07-12 10:28:05 +0100
committerStuart Monteith <stuart.monteith@linaro.org>2019-07-12 09:32:38 +0000
commit91d5ff3bd9029f01b86331f411e0293c005ac715 (patch)
treec426188993e51a405bc43b9c46b1c3a3ce9318b6 /jdkX-build-image.yaml
parent8819b2af9d4c990d223f980f18780506849e4c34 (diff)
jdk: GTestWrapper.java looks in wrong place.
We can't have tests using the nativepath pass and the gtest changes I made work at the same time. Move them to another location. In essence, the jtreg tests expect "native/lib" in the path, whereas the GTestWrapper expects just "native". Change-Id: Iede3ec387957c7f2a710ffaf718d63afffc0b96f
Diffstat (limited to 'jdkX-build-image.yaml')
-rw-r--r--jdkX-build-image.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml
index bc530144..33d7daa7 100644
--- a/jdkX-build-image.yaml
+++ b/jdkX-build-image.yaml
@@ -99,8 +99,8 @@
# Copy gtest materials to the correct place.
( cd build-stage2
- mkdir -p support/test/hotspot/gtest/server
- cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/gtest/server
+ mkdir support/test/hotspot/jtreg/native/lib/server
+ cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/jtreg/native/lib/server
)
# Archive test support files.