[jtreg] 02/07: Merge tag 'upstream/4.1-b12'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jun 18 16:40:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jtreg.
commit 286e608ff28dd7d2803bf38b5a3eb81548fac75e
Merge: 6356b87 b037d68
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jun 18 17:49:21 2015 +0200
Merge tag 'upstream/4.1-b12'
Upstream version 4.1-b12
.hg_archival.txt | 4 +-
.hgtags | 3 +
make/Defs.gmk | 18 +-
make/Makefile | 5 +-
make/Rules.gmk | 6 +-
make/build.xml | 39 +-
make/jtdiff.gmk | 24 +-
make/jtreg.gmk | 73 +-
make/netbeans/jtreg/nbproject/project.xml | 19 +
make/tests/CleanupTest.gmk | 10 +-
.../tests/{jcovtest.gmk => CompileArgFileTest.gmk} | 43 +-
make/tests/CompileTests.gmk | 12 +-
make/tests/EmptyTest.gmk | 193 ++++
make/tests/EnvTest.gmk | 10 +-
make/tests/{jcovtest.gmk => ExtLibTest.gmk} | 38 +-
make/tests/GroupTest.gmk | 3 +-
make/tests/NoJUnit.gmk | 2 +-
make/tests/{NoJUnit.gmk => RequiresTest.gmk} | 34 +-
make/tests/RerunTest.gmk | 10 +-
make/tests/TestNativePath.gmk | 133 +++
make/tests/TestRequiredVersion.gmk | 64 ++
make/tests/TimeoutHandlerTest.gmk | 101 ++
make/tests/TimeoutTest.gmk | 47 +-
make/tests/coverage.gmk | 2 +-
make/tests/i18n.com.sun.javatest.regtest.gmk | 2 +-
make/tests/jcov.gmk | 2 +-
make/tests/jcovtest.gmk | 2 +-
src/share/bin/jtdiff.sh | 4 +-
src/share/bin/jtreg.sh | 4 +-
.../com/sun/javatest/diff/WorkDirectoryReader.java | 13 +-
.../classes/com/sun/javatest/regtest/Action.java | 290 +-----
.../com/sun/javatest/regtest/ActionRecorder.java | 57 +-
.../classes/com/sun/javatest/regtest/Agent.java | 503 +++------
.../classes/com/sun/javatest/regtest/Alarm.java | 105 --
.../com/sun/javatest/regtest/AppletAction.java | 77 +-
.../com/sun/javatest/regtest/BuildAction.java | 23 +-
.../sun/javatest/regtest/CachingTestFilter.java | 4 +-
.../com/sun/javatest/regtest/CleanAction.java | 4 +-
.../com/sun/javatest/regtest/CompileAction.java | 414 ++++----
.../javatest/regtest/DefaultTimeoutHandler.java | 95 ++
.../classes/com/sun/javatest/regtest/Expr.java | 917 +++++++++++++++++
.../com/sun/javatest/regtest/GroupManager.java | 36 +-
.../classes/com/sun/javatest/regtest/Help.java | 7 +-
.../com/sun/javatest/regtest/IgnoreAction.java | 12 +-
.../com/sun/javatest/regtest/JCovManager.java | 23 +-
.../classes/com/sun/javatest/regtest/JDK.java | 106 +-
.../com/sun/javatest/regtest/JUnitAction.java | 6 +-
.../com/sun/javatest/regtest/Locations.java | 104 +-
.../classes/com/sun/javatest/regtest/Main.java | 330 ++++--
.../com/sun/javatest/regtest/MainAction.java | 399 ++------
src/share/classes/com/sun/javatest/regtest/OS.java | 17 +-
.../com/sun/javatest/regtest/ProcessCommand.java | 364 +++++++
.../com/sun/javatest/regtest/ProcessUtils.java | 69 ++
.../sun/javatest/regtest/RegressionContext.java | 196 ++++
.../{StringUtils.java => RegressionKeywords.java} | 37 +-
.../sun/javatest/regtest/RegressionParameters.java | 255 ++++-
.../sun/javatest/regtest/RegressionReporter.java | 81 +-
.../com/sun/javatest/regtest/RegressionScript.java | 200 ++--
.../sun/javatest/regtest/RegressionTestFinder.java | 159 ++-
.../sun/javatest/regtest/RegressionTestSuite.java | 28 +-
.../com/sun/javatest/regtest/ShellAction.java | 76 +-
.../com/sun/javatest/regtest/StreamCopier.java | 73 ++
.../com/sun/javatest/regtest/StringUtils.java | 3 +-
.../com/sun/javatest/regtest/TestManager.java | 35 +-
.../com/sun/javatest/regtest/TestNGAction.java | 10 +-
.../com/sun/javatest/regtest/TestNGReporter.java | 4 +-
.../com/sun/javatest/regtest/TestProperties.java | 81 +-
.../com/sun/javatest/regtest/TimeoutHandler.java | 117 +++
.../javatest/regtest/TimeoutHandlerProvider.java | 103 ++
.../classes/com/sun/javatest/regtest/Verbose.java | 7 +-
.../classes/com/sun/javatest/regtest/Version.java | 89 +-
.../sun/javatest/regtest/agent/ActionHelper.java | 308 ++++++
.../sun/javatest/regtest/agent/AgentServer.java | 322 ++++++
.../com/sun/javatest/regtest/agent/Alarm.java | 225 ++++
.../regtest/{ => agent}/AppletWrapper.java | 4 +-
.../regtest/agent/CompileActionHelper.java | 145 +++
.../regtest/{ => agent}/GetSystemProperty.java | 23 +-
.../JDK_Version.java} | 53 +-
.../javatest/regtest/agent/MainActionHelper.java | 337 ++++++
.../javatest/regtest/{ => agent}/MainWrapper.java | 6 +-
.../sun/javatest/regtest/{ => agent}/RStatus.java | 14 +-
.../{ => agent}/RegressionCompileCommand.java | 6 +-
.../{ => agent}/RegressionSecurityManager.java | 4 +-
.../regtest/{Path.java => agent/SearchPath.java} | 37 +-
.../javatest/regtest/{ => agent}/StringArray.java | 4 +-
.../com/sun/javatest/regtest/agent/i18n.properties | 32 +-
.../com/sun/javatest/regtest/i18n.properties | 96 +-
src/share/doc/javatest/regtest/faq.xml | 2 +-
src/share/doc/javatest/regtest/tag-spec.html | 1074 ++++++++++++++++++++
src/share/doc/javatest/regtest/tag-spec.txt | 551 ----------
src/share/test/javatest/regtest/Basic.java | 10 +-
.../test/javatest/regtest/GenCompileTests.java | 61 ++
.../test/javatest/regtest/data/empty/ts1/TEST.ROOT | 1 +
.../javatest/regtest/data/empty/ts1/TEST.groups | 2 +
.../test/javatest/regtest/data/empty/ts1/Test.java | 6 +
.../regtest/data/empty/ts1/empty/Empty.java | 0
.../test/javatest/regtest/data/empty/ts2/TEST.ROOT | 1 +
.../javatest/regtest/data/empty/ts2/TEST.groups | 1 +
.../regtest/data/empty/ts2/empty/Empty.java | 0
.../javatest/regtest/data/env/applet/lib/dummy | 1 +
.../javatest/regtest/data/env/compile/lib/dummy | 1 +
src/share/test/javatest/regtest/data/env/lib/dummy | 1 +
.../test/javatest/regtest/data/env/main/lib/dummy | 1 +
.../test/javatest/regtest/data/env/shell/lib/dummy | 1 +
.../javatest/regtest/data/extlib/libs/lib/Lib.java | 1 +
.../javatest/regtest/data/extlib/test/TEST.ROOT | 1 +
.../javatest/regtest/data/extlib/test/Test.java | 14 +
.../regtest/data/keywords.badProps/TEST.ROOT | 0
.../keywords.badProps/badProps/TEST.properties | 1 +
.../data/keywords.badProps/badProps/Test.java | 7 +
.../data/keywords.badTest/InvalidKeyword.java | 8 +
.../regtest/data/keywords.badTest/TEST.ROOT | 0
.../data/keywords.badTest/UnknownKeyword.java | 8 +
.../regtest/data/keywords.good/DashKeyword.java | 8 +
.../javatest/regtest/data/keywords.good/TEST.ROOT | 2 +
.../regtest/data/nativepath/NativesEmpty.java} | 32 +-
.../regtest/data/nativepath/NativesEmptyShell.sh | 36 +-
.../regtest/data/nativepath/NativesOK.java} | 39 +-
.../regtest/data/nativepath/NativesOKShell.sh | 37 +-
.../javatest/regtest/data/nativepath/TEST.ROOT | 0
.../javatest/regtest/data/requires/EmptyTest.java} | 28 +-
.../javatest/regtest/data/requires/EvalTest.java} | 28 +-
.../javatest/regtest/data/requires/ExprTest.java} | 44 +-
.../regtest/data/requires/FlavorTest.java} | 35 +-
.../regtest/data/requires/MultipleTest.java} | 29 +-
.../regtest/data/requires/NameNotFoundTest.java} | 28 +-
.../regtest/data/requires/RegexpTest.java} | 35 +-
.../regtest/data/requires/SyntaxTest.java} | 28 +-
.../test/javatest/regtest/data/requires/TEST.ROOT | 1 +
.../regtest/data/rerun/std/AppletTest.agentvm.out | 20 +-
.../regtest/data/rerun/std/AppletTest.othervm.out | 18 +-
.../regtest/data/rerun/std/AppletTest.samevm.out | 20 +-
.../regtest/data/rerun/std/BuildTest.agentvm.out | 18 +-
.../regtest/data/rerun/std/BuildTest.othervm.out | 16 +-
.../regtest/data/rerun/std/BuildTest.samevm.out | 18 +-
.../regtest/data/rerun/std/CompileTest.agentvm.out | 18 +-
.../regtest/data/rerun/std/CompileTest.othervm.out | 16 +-
.../regtest/data/rerun/std/CompileTest.samevm.out | 18 +-
.../regtest/data/rerun/std/JUnitTest.agentvm.out | 36 +-
.../regtest/data/rerun/std/JUnitTest.othervm.out | 34 +-
.../regtest/data/rerun/std/JUnitTest.samevm.out | 36 +-
.../regtest/data/rerun/std/MainTest.agentvm.out | 36 +-
.../regtest/data/rerun/std/MainTest.othervm.out | 34 +-
.../regtest/data/rerun/std/MainTest.samevm.out | 36 +-
.../regtest/data/rerun/std/TestNGTest.agentvm.out | 36 +-
.../regtest/data/rerun/std/TestNGTest.othervm.out | 34 +-
.../regtest/data/rerun/std/TestNGTest.samevm.out | 36 +-
.../data/rerun/testng/TestNGTest.agentvm.out | 36 +-
.../data/rerun/testng/TestNGTest.othervm.out | 34 +-
.../data/rerun/testng/TestNGTest.samevm.out | 36 +-
.../regtest/data/timeouthandlers/MyHandler.java} | 27 +-
.../regtest/data/timeouthandlers/TEST.ROOT | 0
.../data/timeouthandlers/TestJavaHang.java} | 25 +-
.../javatest/regtest/data/timeouts/make/Makefile | 3 -
.../javatest/regtest/data/timeouts/test/Makefile | 11 +-
155 files changed, 7598 insertions(+), 3270 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtreg.git
More information about the pkg-java-commits
mailing list