diff options
| author | Samantha Sample <samsample@google.com> | 2019-08-05 17:18:51 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-08-05 17:20:05 -0700 |
| commit | fb996668e40031671e08d107e1a5307e813215f9 (patch) | |
| tree | cba2bce2e38dfbf97f56d42a5099b1e26bc3469f /test/runtimes/java/proctor-java.go | |
| parent | 23e740433d6a92c06068923ab58232a19c7a5acb (diff) | |
Alter Dockerfiles to include common.go and use a prebuilt JDK.
After the refactoring of the proctor binaries, the Dockerfiles for each
language must be altered to copy the common folder into their image.
Additionally, Java has been changed to use the pre-built version of
JDK-11 from Ubuntu, instead of building it from the source. This allows
for a smaller image and faster test execution within the container.
PiperOrigin-RevId: 261805158
Diffstat (limited to 'test/runtimes/java/proctor-java.go')
| -rw-r--r-- | test/runtimes/java/proctor-java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/runtimes/java/proctor-java.go b/test/runtimes/java/proctor-java.go index c1e611b4b..7f6a66f4f 100644 --- a/test/runtimes/java/proctor-java.go +++ b/test/runtimes/java/proctor-java.go @@ -29,6 +29,7 @@ import ( var ( dir = os.Getenv("LANG_DIR") + hash = os.Getenv("LANG_HASH") jtreg = filepath.Join(dir, "jtreg/bin/jtreg") exclDirs = regexp.MustCompile(`(^(sun\/security)|(java\/util\/stream)|(java\/time)| )`) ) @@ -44,7 +45,7 @@ func main() { func (j javaRunner) ListTests() ([]string, error) { args := []string{ - "-dir:test/jdk", + "-dir:/root/jdk11-" + hash + "/test/jdk", "-ignore:quiet", "-a", "-listtests", @@ -69,7 +70,7 @@ func (j javaRunner) ListTests() ([]string, error) { } func (j javaRunner) RunTest(test string) error { - args := []string{"-dir:test/jdk/", test} + args := []string{"-noreport", "-dir:/root/jdk11-" + hash + "/test/jdk", test} cmd := exec.Command(jtreg, args...) cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr if err := cmd.Run(); err != nil { |