From 2ae946428dd9b6aa9b3340333087ccd3200e5a56 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Mon, 23 May 2022 09:47:31 -0700 Subject: [PATCH] Do not make java runtime tests generate HTML report. This report is not consumed anywhere and this step adds a lot of seconds of delay for jtreg to return. You can see reproduce the delay locally by running the java runtime tests. Before: ``` ... Test results: passed: 1 Report written to /root/JTreport/html/report.html Results written to /root/JTwork ``` After: ``` ... Test results: passed: 1 Results written to /root/JTwork ``` PiperOrigin-RevId: 450461090 --- test/runtimes/README.md | 2 +- test/runtimes/proctor/lib/java.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/runtimes/README.md b/test/runtimes/README.md index 372042b7e..5eaec65e1 100644 --- a/test/runtimes/README.md +++ b/test/runtimes/README.md @@ -40,7 +40,7 @@ download the language image and call Docker directly with the test arguments. Language | Version | Download Image | Run Test(s) -------- | ------- | ---------------------------------- | ----------- Go | 1.16 | `make load-runtimes_go1.16` | If the test name ends with `.go`, it is an on-disk test:
`docker run --runtime=runsc -it gvisor.dev/images/runtimes/go1.16 ( cd /usr/local/go/test ; go run run.go -v -- ... )`
Otherwise it is a tool test:
`docker run --runtime=runsc -it gvisor.dev/images/runtimes/go1.16 go tool dist test -v -no-rebuild ^TEST1$\|^TEST2$...` -Java | 17 | `make load-runtimes_java17` | `docker run --runtime=runsc -it gvisor.dev/images/runtimes/java17 jtreg -agentvm -dir:/root/test/jdk -noreport -timeoutFactor:20 -verbose:summary ...` +Java | 17 | `make load-runtimes_java17` | `docker run --runtime=runsc -it gvisor.dev/images/runtimes/java17 jtreg -agentvm -dir:/root/test/jdk -noreport -timeoutFactor:5 -verbose:all -tl:200 ...` NodeJS | 16.13.2 | `make load-runtimes_nodejs16.13.2` | `docker run --runtime=runsc -it gvisor.dev/images/runtimes/nodejs16.13.2 python tools/test.py --timeout=180 ...` Php | 8.1.1 | `make load-runtimes_php8.1.1` | `docker run --runtime=runsc -it gvisor.dev/images/runtimes/php8.1.1 make test "TESTS=..."` Python | 3.10.2 | `make load-runtimes_python3.10.2` | `docker run --runtime=runsc -it gvisor.dev/images/runtimes/python3.10.2 ./python -m test ...` diff --git a/test/runtimes/proctor/lib/java.go b/test/runtimes/proctor/lib/java.go index 4de6748a3..c94f46e9f 100644 --- a/test/runtimes/proctor/lib/java.go +++ b/test/runtimes/proctor/lib/java.go @@ -66,6 +66,7 @@ func (javaRunner) TestCmds(tests []string) []*exec.Cmd { []string{ "-agentvm", // Execute each action using a pool of reusable JVMs. "-dir:" + javaTestDir, // Base directory for test files and directories. + "-noreport", // Do not generate /root/JTreport/html/report.html. "-timeoutFactor:5", // Extend the default timeout (2 min) of all tests by this factor. "-verbose:all", // Verbose output. "-tl:200", // Do not run tests which specify a timeout longer than 200s.