diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2019-07-10 15:11:02 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2019-07-10 14:18:14 +0000 |
| commit | a60a3f0933fe305d5290395afa85b27899ff2bde (patch) | |
| tree | e67a248a66145470182764ab989f98ad2396dda9 /jdkX-build-image.yaml | |
| parent | 92e52861ebdca9b1facaf3a7998a3403508e8c07 (diff) | |
jdk: Fix gtestwrapper jtreg test
Copy gtest materials into the correct place.
Change-Id: I887238e4212d9b21c4984632c351dda708da29c2
Diffstat (limited to 'jdkX-build-image.yaml')
| -rw-r--r-- | jdkX-build-image.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml index 2b0fee01..b747d582 100644 --- a/jdkX-build-image.yaml +++ b/jdkX-build-image.yaml @@ -84,12 +84,12 @@ pushd build-stage2 sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} - make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native + make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest popd else pushd build-stage2 sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} - make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native + make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest popd fi @@ -97,6 +97,10 @@ artifact_name=jdkX-${BUILD_TYPE} tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . + # Copy gtest materials to the correct place. + 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 + # Archive test support files. tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test publishers: |