# HG changeset patch # User erikj # Date 1566828855 25200 # Node ID c414c554b38b3a5aff5047df2923669ac2e06efa # Parent ff08db52ad92ab404c225834474c85c0313c0da4 8230079: Update test document by changing "TIMEOUT" to "TIMEOUT_FACTOR" Reviewed-by: erikj Contributed-by: Wang Xue diff -r ff08db52ad92 -r c414c554b38b doc/building.html --- a/doc/building.html Mon Aug 26 14:48:12 2019 +0100 +++ b/doc/building.html Mon Aug 26 07:14:15 2019 -0700 @@ -572,6 +572,7 @@
  • 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 -r ff08db52ad92 -r c414c554b38b doc/testing.html --- a/doc/testing.html Mon Aug 26 14:48:12 2019 +0100 +++ b/doc/testing.html Mon Aug 26 07:14:15 2019 -0700 @@ -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 @@

    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 -r ff08db52ad92 -r c414c554b38b doc/testing.md --- a/doc/testing.md Mon Aug 26 14:48:12 2019 +0100 +++ b/doc/testing.md Mon Aug 26 07:14:15 2019 -0700 @@ -23,7 +23,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 @@ -180,11 +180,11 @@ 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 @@ 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