[jtreg] 01/03: Merge tag 'upstream/4.2-b05'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jtreg.

commit 7dc6fa81c97b034a8576f0b451fe1af23f5249ae
Merge: cb4e62d 74df82d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 20 11:12:13 2017 +0100

    Merge tag 'upstream/4.2-b05'
    
    Upstream version 4.2-b05

 .hg_archival.txt                                   |   4 +-
 .hgtags                                            |   1 +
 make/Defs.gmk                                      |   1 +
 make/tests/AddModulesTest.gmk                      |  44 ++++++
 make/tests/BadTests.gmk                            |   4 +-
 make/tests/DebugTest.gmk                           |   8 +-
 make/tests/TestNGJUnitTest.gmk                     |  51 +++++++
 make/tests/docs.gmk                                |  34 +++++
 .../idea/.idea/runConfigurations/jtreg_plugin.xml  |   1 +
 plugins/idea/README.md                             |  10 +-
 plugins/idea/resources/META-INF/plugin.xml         |   4 +-
 .../plugin/jtreg/ant/JTRegAntConfiguration.java    | 102 -------------
 .../jtreg/components/JTRegFileManagerListener.java |   9 +-
 .../JTRegConfigurationRunnableState.java           |  17 ++-
 .../oracle/plugin/jtreg/service/JTRegService.java  |   3 +-
 .../jtreg/service/ui/JTRegServiceConfigurable.java |   3 +-
 .../com/oracle/plugin/jtreg/util/JTRegUtils.java   |  15 ++
 src/share/bin/jtreg.sh                             |   5 +-
 .../com/sun/javatest/regtest/agent/Alarm.java      |   6 +-
 .../sun/javatest/regtest/agent/TestNGRunner.java   |   8 +-
 .../com/sun/javatest/regtest/config/Modules.java   |   7 +-
 .../regtest/config/RegressionTestFinder.java       | 120 ++++++++++-----
 .../com/sun/javatest/regtest/exec/Action.java      |  17 +--
 .../com/sun/javatest/regtest/exec/Agent.java       | 169 +++++++++++++--------
 .../sun/javatest/regtest/exec/CompileAction.java   |  35 ++++-
 .../com/sun/javatest/regtest/exec/JUnitAction.java |   6 +-
 .../com/sun/javatest/regtest/exec/MainAction.java  |  20 ++-
 .../sun/javatest/regtest/exec/ProcessCommand.java  |  78 +++++++---
 .../javatest/regtest/exec/RegressionScript.java    |  29 ++--
 .../sun/javatest/regtest/exec/TestNGAction.java    |  15 +-
 src/share/doc/javatest/regtest/README              |  33 +---
 src/share/doc/javatest/regtest/tag-spec.html       | 140 +++++++++--------
 .../test/javatest/regtest/data/addmods/TEST.ROOT   |   0
 .../data/addmods/TestNonDefaultCompiler.java       |  41 +++++
 .../data/addmods/TestNonDefaultRuntime.java        |  40 +++++
 .../regtest/data/rerun/std/TestNGTest.agentvm.out  |   2 +-
 .../regtest/data/rerun/std/TestNGTest.othervm.out  |   2 +-
 .../data/rerun/testng/TestNGTest.agentvm.out       |   2 +-
 .../data/rerun/testng/TestNGTest.othervm.out       |   2 +-
 .../javatest/regtest/data/testng-junit/TEST.ROOT   |   0
 .../data/testng-junit/testng/TEST.properties       |   1 +
 .../regtest/data/testng-junit/testng/p/T1.java     |  18 +++
 .../regtest/data/testng-junit/testng/p/T2.java     |  18 +++
 43 files changed, 731 insertions(+), 394 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtreg.git