From 103cd91d421c6ce358f0d431d33b628f221055be Mon Sep 17 00:00:00 2001 From: Wang Xue Date: Mon, 26 Aug 2019 07:14:15 -0700 Subject: [PATCH] 8230079: Update test document by changing "TIMEOUT" to "TIMEOUT_FACTOR" Reviewed-by: erikj --- doc/building.html | 1 + doc/testing.html | 6 +++--- doc/testing.md | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/doc/building.html b/doc/building.html index cb19d10c0e0..d5e7dfee631 100644 --- a/doc/building.html +++ b/doc/building.html @@ -572,6 +572,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
  • CONF_CHECK
  • COMPARE_BUILD
  • JDK_FILTER
    • +
  • SPEC_FILTER

    • Running Tests

    Most of the JDK tests are using the JTReg test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the --with-jtreg=<path to jtreg home> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing lib/jtreg.jar etc.

    diff --git a/doc/testing.html b/doc/testing.html index e51a3390731..dec76746bb5 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -54,7 +54,7 @@ $ make test-jdk_lang JTREG="JOBS=8" $ make test TEST=jdk_lang $ make test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1" -$ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug" +$ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug" $ make test TEST="jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java" $ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2" $ make exploded-test TEST=tier2 @@ -103,9 +103,9 @@ TEST FAILURE

    Additional work data is stored in build/$BUILD/test-support/$TEST_ID. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.

    Test suite control

    It is possible to control various aspects of the test suites using make control variables.

    -

    These variables use a keyword=value approach to allow multiple values to be set. So, for instance, JTREG="JOBS=1;TIMEOUT=8" will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting JTREG_JOBS=1 JTREG_TIMEOUT=8, but using the keyword format means that the JTREG variable is parsed and verified for correctness, so JTREG="TMIEOUT=8" would give an error, while JTREG_TMIEOUT=8 would just pass unnoticed.

    +

    These variables use a keyword=value approach to allow multiple values to be set. So, for instance, JTREG="JOBS=1;TIMEOUT_FACTOR=8" will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8, but using the keyword format means that the JTREG variable is parsed and verified for correctness, so JTREG="TMIEOUT_FACTOR=8" would give an error, while JTREG_TMIEOUT_FACTOR=8 would just pass unnoticed.

    To separate multiple keyword=value pairs, use ; (semicolon). Since the shell normally eats ;, the recommended usage is to write the assignment inside qoutes, e.g. JTREG="...;...". This will also make sure spaces are preserved, as in JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug".

    -

    (Other ways are possible, e.g. using backslash: JTREG=JOBS=1\;TIMEOUT=8. Also, as a special technique, the string %20 will be replaced with space for certain options, e.g. JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)

    +

    (Other ways are possible, e.g. using backslash: JTREG=JOBS=1\;TIMEOUT_FACTOR=8. Also, as a special technique, the string %20 will be replaced with space for certain options, e.g. JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)

    As far as possible, the names of the keywords have been standardized between test suites.

    General keywords (TEST_OPTS)

    Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don't want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.

    diff --git a/doc/testing.md b/doc/testing.md index 1727dc63ad9..c4023e15248 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -23,7 +23,7 @@ Some example command-lines: $ make test-jdk_lang JTREG="JOBS=8" $ make test TEST=jdk_lang $ make test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1" - $ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug" + $ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug" $ make test TEST="jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java" $ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2" $ make exploded-test TEST=tier2 @@ -180,11 +180,11 @@ It is possible to control various aspects of the test suites using make control variables. These variables use a keyword=value approach to allow multiple values to be -set. So, for instance, `JTREG="JOBS=1;TIMEOUT=8"` will set the JTReg +set. So, for instance, `JTREG="JOBS=1;TIMEOUT_FACTOR=8"` will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to -setting `JTREG_JOBS=1 JTREG_TIMEOUT=8`, but using the keyword format means that +setting `JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8`, but using the keyword format means that the `JTREG` variable is parsed and verified for correctness, so -`JTREG="TMIEOUT=8"` would give an error, while `JTREG_TMIEOUT=8` would just +`JTREG="TMIEOUT_FACTOR=8"` would give an error, while `JTREG_TMIEOUT_FACTOR=8` would just pass unnoticed. To separate multiple keyword=value pairs, use `;` (semicolon). Since the shell @@ -192,7 +192,7 @@ normally eats `;`, the recommended usage is to write the assignment inside qoutes, e.g. `JTREG="...;..."`. This will also make sure spaces are preserved, as in `JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`. -(Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT=8`. +(Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT_FACTOR=8`. Also, as a special technique, the string `%20` will be replaced with space for certain options, e.g. `JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`. This can be useful if you have layers of scripts and have trouble getting