diff options
| author | Andrew McDermott <andrew.mcdermott@linaro.org> | 2013-07-31 15:12:18 +0100 |
|---|---|---|
| committer | Andrew McDermott <andrew.mcdermott@linaro.org> | 2013-07-31 15:12:18 +0100 |
| commit | 71f142e8be0d448080f4927ee52f0475636b2324 (patch) | |
| tree | 2c27afc7f2f3a0b6b00ec5f8a9a6a0626747d34f /openembedded | |
| parent | b8a9748e1b3dfc4106c500a7a31b3f018f337446 (diff) | |
mauve: fall back to openjdk-8 JRE if openjdk-8 JDK not present
If the JDK has not been installed but the JRE has then fall back to
using the explicit path of the JRE. Of course, if the
update-alternatives mechanism makes java -> .../jre/bin/java then
that's fine too. But for testing we definitely want to be using JDK8,
so we force the issue via an explicit PATH.
Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
Diffstat (limited to 'openembedded')
| -rw-r--r-- | openembedded/mauve-sanity-test.yaml | 3 | ||||
| -rw-r--r-- | openembedded/mauve.yaml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/openembedded/mauve-sanity-test.yaml b/openembedded/mauve-sanity-test.yaml index ecf05c8..71f74d7 100644 --- a/openembedded/mauve-sanity-test.yaml +++ b/openembedded/mauve-sanity-test.yaml @@ -1,7 +1,7 @@ metadata: name: mauve format: "Lava-Test-Shell Test Definition 1.0" - description: "Mauve Sanity Tests for Open Embedded" + description: "Mauve Sanity Test for Open Embedded" version: 1.0 install: @@ -12,6 +12,7 @@ install: run: steps: - 'PATH=$PATH:/lava/tests/$TESTRUN_ID/test-definitions/openembedded/scripts' + - 'PATH=/usr/lib/jvm/java-8-openjdk/jre/bin:$PATH' - 'PATH=/usr/lib/jvm/java-8-openjdk/bin:$PATH' - 'which java' - 'java -version' diff --git a/openembedded/mauve.yaml b/openembedded/mauve.yaml index fdd8b4d..e5249cc 100644 --- a/openembedded/mauve.yaml +++ b/openembedded/mauve.yaml @@ -16,6 +16,7 @@ run: - 'Xvfb $DISPLAY &' - 'XVFBPID=$!' - 'PATH=$PATH:/lava/tests/$TESTRUN_ID/test-definitions/openembedded/scripts' + - 'PATH=/usr/lib/jvm/java-8-openjdk/jre/bin:$PATH' - 'PATH=/usr/lib/jvm/java-8-openjdk/bin:$PATH' - 'which java' - 'java -version' |