This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtreg.
commit 1cace6760c9b20f40ed3c6dda7cc4a264b83f18b Merge: 9e1d062 fa0dcce Author: Emmanuel Bourg <[email protected]> Date: Wed Apr 20 13:01:43 2016 +0200 Merge tag 'upstream/4.2-b01' Upstream version 4.2-b01 .hg_archival.txt | 4 +- .hgtags | 2 + make/Defs.gmk | 10 + make/jtreg.gmk | 21 +- make/netbeans/jtreg/nbproject/project.xml | 20 +- make/tests/AutoVMTests.gmk | 7 +- make/tests/{JDK11Test.gmk => BadLibsTest.gmk} | 58 +- make/tests/BadTests.gmk | 27 +- make/tests/Basic.gmk | 7 +- make/tests/{T4730538.gmk => BuildPatternTest.gmk} | 25 +- make/tests/CPAppendTests.gmk | 20 +- make/tests/CleanupTest.gmk | 27 +- make/tests/{PropertyTests.gmk => DebugTest.gmk} | 46 +- make/tests/ExcludeTest.gmk | 6 +- .../{TimelimitTests.gmk => ExtraPropDefnsTest.gmk} | 84 ++- make/tests/IgnoreSymbolFileTest.gmk | 6 +- make/tests/JDK11Test.gmk | 4 +- make/tests/{OSTest.gmk => JDKOptsTest.gmk} | 11 +- make/tests/JavacExitCodeTests.gmk | 31 +- make/tests/JavacTests.gmk | 8 +- make/tests/{JavacTests.gmk => ModLibsTest.gmk} | 34 +- make/tests/{PropertyTests.gmk => ModulesTest.gmk} | 36 +- make/tests/MultiRunTest.gmk | 10 +- make/tests/OSTest.gmk | 1 + make/tests/OpenFileTests.gmk | 27 +- .../{SecurityProviderTest.gmk => PkgInfoTest.gmk} | 22 +- make/tests/ProblemList.gmk | 6 +- make/tests/PropertyTests.gmk | 8 +- make/tests/RerunTest.gmk | 6 +- make/tests/SecurityManagerTests.gmk | 12 +- make/tests/SecurityProviderTest.gmk | 8 +- make/tests/StatsTests.gmk | 6 +- make/tests/T4730538.gmk | 4 +- make/tests/T6517728.gmk | 4 +- make/tests/T6517916.gmk | 6 +- make/tests/T6519296.gmk | 4 +- make/tests/T6533136.gmk | 6 +- make/tests/TestNativePath.gmk | 5 +- make/tests/TestVMOpts.gmk | 10 +- make/tests/TestWhiteSpaceFiles.gmk | 8 +- make/tests/TimelimitTests.gmk | 12 +- make/tests/TimeoutHandlerTest.gmk | 20 +- make/tests/TimeoutHandlerTimeoutTest.gmk | 67 +++ make/tests/TimeoutTest.gmk | 16 +- make/tests/jcov.gmk | 7 +- .../classes/com/sun/javatest/regtest/Action.java | 139 ++++- .../com/sun/javatest/regtest/ActionRecorder.java | 49 +- .../classes/com/sun/javatest/regtest/Agent.java | 28 +- .../com/sun/javatest/regtest/AppletAction.java | 77 +-- .../com/sun/javatest/regtest/BuildAction.java | 220 +++++-- .../com/sun/javatest/regtest/CleanAction.java | 22 +- .../com/sun/javatest/regtest/CompileAction.java | 443 +++++++------- .../javatest/regtest/DefaultTimeoutHandler.java | 3 +- .../com/sun/javatest/regtest/DriverAction.java | 24 +- .../sun/javatest/regtest/ElapsedTimeHandler.java | 4 +- .../classes/com/sun/javatest/regtest/Expr.java | 3 +- .../com/sun/javatest/regtest/ExtraPropDefns.java | 338 +++++++++++ .../com/sun/javatest/regtest/IgnoreAction.java | 11 +- .../com/sun/javatest/regtest/JCovManager.java | 2 +- .../classes/com/sun/javatest/regtest/JDK.java | 365 +++++++++--- .../classes/com/sun/javatest/regtest/JDKOpts.java | 170 ++++++ .../com/sun/javatest/regtest/JUnitAction.java | 32 +- .../com/sun/javatest/regtest/Locations.java | 643 +++++++++++++++++---- .../classes/com/sun/javatest/regtest/Main.java | 427 ++++---------- .../com/sun/javatest/regtest/MainAction.java | 279 +++++---- src/share/classes/com/sun/javatest/regtest/OS.java | 18 +- .../com/sun/javatest/regtest/ProcessCommand.java | 11 +- .../sun/javatest/regtest/RegressionContext.java | 87 ++- .../sun/javatest/regtest/RegressionParameters.java | 179 +++++- .../sun/javatest/regtest/RegressionReporter.java | 10 +- .../com/sun/javatest/regtest/RegressionScript.java | 524 +++++++++++++---- .../sun/javatest/regtest/RegressionTestFinder.java | 65 ++- .../sun/javatest/regtest/RegressionTestSuite.java | 10 +- .../com/sun/javatest/regtest/ScratchDirectory.java | 40 +- .../com/sun/javatest/regtest/ShellAction.java | 23 +- .../com/sun/javatest/regtest/TestManager.java | 12 + .../com/sun/javatest/regtest/TestNGAction.java | 77 ++- .../com/sun/javatest/regtest/TestNGReporter.java | 4 +- .../com/sun/javatest/regtest/TestProperties.java | 31 +- .../com/sun/javatest/regtest/TestStats.java | 4 +- .../com/sun/javatest/regtest/TimeoutHandler.java | 36 +- .../javatest/regtest/TimeoutHandlerProvider.java | 36 +- .../sun/javatest/regtest/agent/ActionHelper.java | 2 +- .../sun/javatest/regtest/agent/AgentServer.java | 27 +- .../com/sun/javatest/regtest/agent/Alarm.java | 2 +- .../javatest/regtest/agent/GetJDKProperties.java | 97 ++++ .../sun/javatest/regtest/agent/JDK_Version.java | 5 +- .../javatest/regtest/agent/MainActionHelper.java | 10 +- .../sun/javatest/regtest/agent/MainWrapper.java | 73 ++- .../sun/javatest/regtest/agent/ModuleHelper.java | 149 +++++ .../com/sun/javatest/regtest/agent/SearchPath.java | 95 +-- .../com/sun/javatest/regtest/i18n.properties | 56 +- .../java/lang/reflect/JTRegModuleHelper.java | 48 ++ src/share/doc/javatest/regtest/README | 9 +- src/share/doc/javatest/regtest/tag-spec.html | 308 +++++++--- .../test/javatest/regtest/BuildPatternTest.java | 111 ++++ src/share/test/javatest/regtest/JDKOptsTest.java | 155 +++++ src/share/test/javatest/regtest/OSTest.java | 4 + src/share/test/javatest/regtest/RetainTest.java | 6 +- .../test/javatest/regtest/data/badlibs/TEST.ROOT | 0 .../build/DirTest.java => badlibs/d1/d2/Test.java} | 48 +- .../javatest/regtest/data/basic/build/DirTest.java | 4 +- .../DirTest.java => debug/ExplicitCompile.java} | 33 +- .../DirTest.java => debug/ImplicitCompile.java} | 33 +- .../test/javatest/regtest/data/debug/TEST.ROOT | 0 .../bad-compile/TEST.ROOT} | 32 +- .../bad-compile/Test1.java} | 36 +- .../bad-compile/support/ExtraProps.java} | 36 +- .../bad-execute/TEST.ROOT} | 32 +- .../bad-execute/Test1.java} | 36 +- .../bad-execute/Test2.java} | 40 +- .../bad-execute/support/ExtraProps.java} | 36 +- .../valid.libs/TEST.ROOT} | 34 +- .../valid.libs/Test1.java} | 36 +- .../valid.libs/support/ExtraProps.java} | 42 +- .../valid.libs/support/OptExtraProps.java} | 37 +- .../support/bootLib/pBootLib/BootLib.java} | 33 +- .../valid.libs/support/lib/pLib/Lib.java} | 33 +- .../DirTest.java => extra-props/valid/TEST.ROOT} | 34 +- .../DirTest.java => extra-props/valid/Test1.java} | 36 +- .../DirTest.java => extra-props/valid/Test2.java} | 36 +- .../DirTest.java => extra-props/valid/Test3.java} | 36 +- .../valid/support/ExtraProps.java} | 40 +- .../valid/support/OptExtraProps.java} | 37 +- .../test/javatest/regtest/data/modlibs/TEST.ROOT | 0 .../buildAction/BuildLibPatch.java} | 34 +- .../buildAction/BuildLibPkg.java} | 34 +- .../buildAction/BuildLibUserModClass.java} | 34 +- .../buildAction/BuildLibUserModClasses.java} | 36 +- .../buildAction/packages/BuildPkg.java} | 33 +- .../buildAction/packages/p/B.java} | 33 +- .../buildAction/patch/BuildPatch.java} | 33 +- .../patch/java.base/java/io/IOHelper.java} | 32 +- .../buildAction/usermods/BuildUserModClass.java} | 33 +- .../buildAction/usermods/BuildUserModClasses.java} | 35 +- .../buildAction/usermods/BuildUserModModule.java} | 34 +- .../buildAction/usermods/BuildUserModPackage.java} | 34 +- .../buildAction/usermods/um1/module-info.java} | 32 +- .../buildAction/usermods/um1/um1_p1/um1_p1_B.java} | 33 +- .../buildAction/usermods/um2/module-info.java} | 32 +- .../buildAction/usermods/um2/um2_p1/um2_p1_B.java} | 33 +- .../buildAction/usermods/um3/module-info.java} | 32 +- .../buildAction/usermods/um3/um3_p1/um3_p1_B.java} | 33 +- .../buildAction/usermods/um4/module-info.java} | 33 +- .../um4/um4_p1/um4_q1/um4_r1/um4_p1_q1_r1_B1.java} | 33 +- .../um4/um4_p1/um4_q1/um4_r1/um4_p1_q1_r1_B2.java} | 33 +- .../um4/um4_p2/um4_q2/um4_r2/um4_p2_q2_r2_B1.java} | 32 +- .../um4/um4_p2/um4_q2/um4_r2/um4_p2_q2_r2_B2.java} | 32 +- .../buildAction/usermods/um5/module-info.java} | 33 +- .../um5/um5_p1/um5_q1/um5_r1/um5_p1_q1_r1_B1.java} | 33 +- .../um5/um5_p1/um5_q1/um5_r1/um5_p1_q1_r1_B2.java} | 33 +- .../um5/um5_p2/um5_q2/um5_r2/um5_p2_q2_r2_B1.java} | 32 +- .../um5/um5_p2/um5_q2/um5_r2/um5_p2_q2_r2_B2.java} | 32 +- .../compileAction/packages/CompilePkg.java} | 33 +- .../compileAction/packages/p/C.java} | 33 +- .../compileAction/patch/CompilePatch.java} | 33 +- .../patch/java.base/java/io/IOHelper.java} | 32 +- .../compileAction/usermods/CompileUserMod.java} | 33 +- .../compileAction/usermods/CompileUserMods.java} | 35 +- .../compileAction/usermods/um1/module-info.java} | 32 +- .../usermods/um1/um1_p1/um1_p1_C.java} | 33 +- .../compileAction/usermods/um2/module-info.java} | 32 +- .../usermods/um2/um2_p1/um2_p1_C.java} | 33 +- .../compileAction/usermods/um3/module-info.java} | 32 +- .../usermods/um3/um3_p1/um3_p1_C.java} | 33 +- .../regtest/data/modlibs/expect-classes.txt | 41 ++ .../libs/packages/lp/lp_C.java} | 33 +- .../java/util/streams/StreamsHelper.java} | 31 +- .../java.base/java/util/TestNGHelper.java} | 33 +- .../libs/usermods/lum1/lum1_p1/lum1_p1_C.java} | 33 +- .../libs/usermods/lum1/module-info.java} | 33 +- .../libs/usermods/lum2/lum2_p1/lum2_p1_C.java} | 33 +- .../libs/usermods/lum2/module-info.java} | 33 +- .../libs/usermods/lum3/lum3_p1/lum3_p1_C.java} | 33 +- .../libs/usermods/lum3/module-info.java} | 33 +- .../mainAction/patchmods/RunPatchMod.java} | 33 +- .../patchmods/java.base/java/util/TestHelper.java} | 36 +- .../mainAction/usermods/RunUserMod.java} | 33 +- .../mainAction/usermods/um1/module-info.java} | 32 +- .../mainAction/usermods/um1/um1_p1/um1_p1_M1.java} | 36 +- .../modlibs/testngAction/patchmods/TEST.properties | 1 + .../java.base/java/util/java_util_TestNGTest.java | 14 + .../modlibs/testngAction/usermods/TEST.properties | 1 + .../testngAction/usermods/um1/module-info.java} | 33 +- .../usermods/um1/um1_p1/um1_p1_T.java} | 35 +- .../testngAction/usermods/um2/module-info.java} | 33 +- .../usermods/um2/um2_p1/um2_p1_T.java} | 35 +- .../DirTest.java => modules/JDKCompilerTest1.java} | 34 +- .../DirTest.java => modules/JDKCompilerTest2.java} | 35 +- .../DirTest.java => modules/JavaBaseTest.java} | 34 +- .../DirTest.java => modules/NoModulesTest.java} | 32 +- .../test/javatest/regtest/data/modules/TEST.ROOT | 0 .../test/javatest/regtest/data/pkgInfo/TEST.ROOT | 0 .../build/DirTest.java => pkgInfo/Test.java} | 37 +- .../DirTest.java => pkgInfo/lib/p/HelloWorld.java} | 33 +- .../lib/p/package-info.java} | 33 +- .../regtest/data/rerun/std/AppletTest.agentvm.out | 23 +- .../regtest/data/rerun/std/AppletTest.othervm.out | 22 +- .../regtest/data/rerun/std/AppletTest.samevm.out | 29 - .../regtest/data/rerun/std/BuildTest.agentvm.out | 6 +- .../regtest/data/rerun/std/BuildTest.othervm.out | 6 +- .../regtest/data/rerun/std/BuildTest.samevm.out | 24 - .../regtest/data/rerun/std/CleanTest.samevm.out | 8 - .../regtest/data/rerun/std/CompileTest.agentvm.out | 5 +- .../regtest/data/rerun/std/CompileTest.othervm.out | 5 +- .../regtest/data/rerun/std/CompileTest.samevm.out | 21 - .../regtest/data/rerun/std/IgnoreTest.samevm.out | 3 - .../regtest/data/rerun/std/JUnitTest.agentvm.out | 8 +- .../regtest/data/rerun/std/JUnitTest.othervm.out | 13 +- .../regtest/data/rerun/std/JUnitTest.samevm.out | 42 -- .../regtest/data/rerun/std/MainTest.agentvm.out | 8 +- .../regtest/data/rerun/std/MainTest.othervm.out | 13 +- .../regtest/data/rerun/std/MainTest.samevm.out | 42 -- .../regtest/data/rerun/std/ShellTest.samevm.out | 19 - .../regtest/data/rerun/std/TestNGTest.agentvm.out | 8 +- .../regtest/data/rerun/std/TestNGTest.othervm.out | 13 +- .../regtest/data/rerun/std/TestNGTest.samevm.out | 42 -- .../data/rerun/testng/TestNGTest.agentvm.out | 9 +- .../data/rerun/testng/TestNGTest.othervm.out | 9 +- .../data/rerun/testng/TestNGTest.samevm.out | 42 -- .../test/javatest/regtest/data/vmopts/build.xml | 18 +- .../TestTimeoutHandler.java} | 43 +- .../javatest/regtest/timeoutHandler/test/TEST.ROOT | 0 .../DirTest.java => timeoutHandler/test/Test.java} | 35 +- 224 files changed, 5223 insertions(+), 4681 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtreg.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
