[jtreg] 03/05: Merge tag 'upstream/4.2-b04'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 8 21:10:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jtreg.
commit 819e8c6a5630346bb5e67891235c2aa0df71ae02
Merge: 1eabe06 967f26b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Dec 8 21:52:25 2016 +0100
Merge tag 'upstream/4.2-b04'
Upstream version 4.2-b04
.hg_archival.txt | 4 +-
.hgignore | 5 +-
.hgtags | 1 +
make/Defs.gmk | 18 +-
make/build.xml | 4 +-
make/jtdiff.gmk | 3 +-
make/jtreg.gmk | 68 +-
make/tests/BootClassPathTest.gmk | 2 +-
make/tests/BuildPatternTest.gmk | 2 +-
make/tests/IgnoreSymbolFileTest.gmk | 2 +-
make/tests/JDKModulesTest.gmk | 5 +-
make/tests/JDKOptsTest.gmk | 2 +-
make/tests/{NoJUnit.gmk => JUnitTrace.gmk} | 26 +-
...noreSymbolFileTest.gmk => LibBuildArgsTest.gmk} | 32 +-
make/tests/{NoJUnit.gmk => ModuleExportsTest.gmk} | 35 +-
make/tests/ModulesTest.gmk | 4 +-
make/tests/OSTest.gmk | 2 +-
make/tests/OpenFileTests.gmk | 1 -
make/tests/OptionDecoderTest.gmk | 2 +-
.../{BootClassPathTest.gmk => PolicyTest.gmk} | 26 +-
make/tests/RerunTest.gmk | 8 +-
make/tests/StatsTests.gmk | 2 +-
make/tests/i18n.com.sun.javatest.regtest.gmk | 51 +-
make/tests/jcov.gmk | 4 +-
plugins/idea/.idea/.name | 1 +
plugins/idea/.idea/compiler.xml | 22 +
plugins/idea/.idea/jtreg-plugin.iml | 40 +
plugins/idea/.idea/misc.xml | 9 +
plugins/idea/.idea/modules.xml | 8 +
.../idea/.idea/runConfigurations/jtreg_plugin.xml | 8 +
plugins/idea/.idea/vcs.xml | 6 +
plugins/idea/README.md | 111 +
plugins/idea/resources/META-INF/plugin.xml | 60 +
.../com/oracle/plugin/jtreg/icons/JavaCup16.png | Bin 0 -> 3512 bytes
.../com/oracle/plugin/jtreg/icons/JavaCup32.png | Bin 0 -> 4955 bytes
plugins/idea/resources/liveTemplates/jtreg.xml | 21 +
.../plugin/jtreg/ant/JTRegAntConfiguration.java | 102 +
.../components/JTRegApplicationComponent.java | 76 +
.../jtreg/components/JTRegFileManagerListener.java | 255 +++
.../jtreg/configuration/JTRegConfiguration.java | 276 +++
.../JTRegConfigurationConsoleProperties.java | 36 +-
.../JTRegConfigurationRunnableState.java | 205 ++
.../configuration/JTRegConfigurationType.java | 79 +
.../producers/JTRegClassConfigurationProducer.java | 66 +
.../producers/JTRegConfigurationProducer.java | 103 +
.../JTRegDirectoryConfigurationProducer.java | 74 +
.../jtreg/configuration/ui/JTRegConfigurable.form | 96 +
.../jtreg/configuration/ui/JTRegConfigurable.java | 120 ++
.../jtreg/executors/JTRegDebuggerRunner.java | 65 +
.../plugin/jtreg/runtime/JTRegTestListener.java | 126 ++
.../oracle/plugin/jtreg/service/JTRegService.java | 196 ++
.../jtreg/service/ui/JTRegServiceConfigurable.form | 83 +
.../jtreg/service/ui/JTRegServiceConfigurable.java | 241 +++
.../jtreg/templates/JTRegTemplateProvider.java | 25 +-
.../oracle/plugin/jtreg/util/JTRegTagParser.java | 123 ++
.../com/oracle/plugin/jtreg/util/JTRegUtils.java | 221 ++
.../plugin/jtreg/util/MapSerializerUtil.java | 104 +
.../idea/src/com/oracle/plugin/jtreg/util/Tag.java | 60 +-
.../idea/src/icons/JTRegPluginIcons.java | 19 +-
src/share/bin/jtreg.sh | 6 +-
src/share/classes/com/sun/javatest/diff/Help.java | 2 +-
src/share/classes/com/sun/javatest/diff/Main.java | 8 +-
.../com/sun/javatest/diff/WorkDirectoryReader.java | 4 +-
.../classes/com/sun/javatest/regtest/BadArgs.java | 4 +-
.../com/sun/javatest/regtest/CheckFiles.java | 76 +-
.../classes/com/sun/javatest/regtest/Main.java | 2175 +-------------------
.../com/sun/javatest/regtest/TestNGAction.java | 362 ----
.../com/sun/javatest/regtest/TimeoutHandler.java | 91 +-
.../sun/javatest/regtest/agent/ActionHelper.java | 16 +-
.../sun/javatest/regtest/agent/AgentServer.java | 21 +-
.../com/sun/javatest/regtest/agent/Alarm.java | 3 +
.../regtest/agent/CompileActionHelper.java | 6 +-
.../regtest/{IgnoreKind.java => agent/Flags.java} | 17 +-
.../sun/javatest/regtest/agent/JDK_Version.java | 1 +
.../sun/javatest/regtest/agent/JUnitRunner.java | 91 +
.../javatest/regtest/agent/MainActionHelper.java | 8 +-
.../sun/javatest/regtest/agent/ModuleHelper.java | 40 +-
.../com/sun/javatest/regtest/agent/SearchPath.java | 6 +-
.../sun/javatest/regtest/agent/StringArray.java | 21 +-
.../sun/javatest/regtest/agent/TestNGRunner.java | 239 +++
.../package-info.java} | 52 +-
.../regtest/{ => config}/CachingTestFilter.java | 7 +-
.../javatest/regtest/{ => config}/ExecMode.java | 4 +-
.../sun/javatest/regtest/{ => config}/Expr.java | 5 +-
.../regtest/{ => config}/ExtraPropDefns.java | 2 +-
.../regtest/{ => config}/GroupManager.java | 55 +-
.../javatest/regtest/{ => config}/IgnoreKind.java | 4 +-
.../com/sun/javatest/regtest/{ => config}/JDK.java | 45 +-
.../sun/javatest/regtest/{ => config}/JDKOpts.java | 97 +-
.../javatest/regtest/{ => config}/Locations.java | 168 +-
.../com/sun/javatest/regtest/config/Modules.java | 234 +++
.../com/sun/javatest/regtest/{ => config}/OS.java | 8 +-
.../regtest/{ => config}/ObservableTestFilter.java | 5 +-
.../regtest/{ => config}/ParseException.java | 6 +-
.../regtest/{ => config}/RegressionContext.java | 5 +-
.../{ => config}/RegressionEnvironment.java | 8 +-
.../regtest/{ => config}/RegressionKeywords.java | 4 +-
.../regtest/{ => config}/RegressionParameters.java | 114 +-
.../regtest/{ => config}/RegressionTestFinder.java | 215 +-
.../regtest/{ => config}/RegressionTestSuite.java | 38 +-
.../javatest/regtest/{ => config}/TestManager.java | 61 +-
.../regtest/{ => config}/TestProperties.java | 41 +-
.../sun/javatest/regtest/config/i18n.properties | 41 +-
.../{BadArgs.java => config/package-info.java} | 27 +-
.../sun/javatest/regtest/{ => exec}/Action.java | 97 +-
.../regtest/{ => exec}/ActionRecorder.java | 3 +-
.../com/sun/javatest/regtest/{ => exec}/Agent.java | 221 +-
.../javatest/regtest/{ => exec}/AppletAction.java | 21 +-
.../javatest/regtest/{ => exec}/BuildAction.java | 10 +-
.../javatest/regtest/{ => exec}/CleanAction.java | 11 +-
.../javatest/regtest/{ => exec}/CompileAction.java | 36 +-
.../regtest/{ => exec}/DefaultTimeoutHandler.java | 14 +-
.../javatest/regtest/{ => exec}/DriverAction.java | 8 +-
.../javatest/regtest/{ => exec}/IgnoreAction.java | 19 +-
.../javatest/regtest/{ => exec}/JUnitAction.java | 57 +-
.../com/sun/javatest/regtest/{ => exec}/Lock.java | 28 +-
.../javatest/regtest/{ => exec}/MainAction.java | 81 +-
.../javatest/regtest/{ => exec}/ModuleConfig.java | 54 +-
.../regtest/{ => exec}/ProcessCommand.java | 10 +-
.../regtest/{ => exec}/RegressionScript.java | 56 +-
.../regtest/{ => exec}/ScratchDirectory.java | 10 +-
.../javatest/regtest/{ => exec}/ShellAction.java | 41 +-
.../sun/javatest/regtest/exec/TestNGAction.java | 175 ++
.../regtest/{ => exec}/TestRunException.java | 4 +-
.../regtest/{ => exec}/TimeoutHandlerProvider.java | 20 +-
.../{BadArgs.java => exec/package-info.java} | 29 +-
.../com/sun/javatest/regtest/i18n.properties | 493 -----
.../regtest/{IgnoreKind.java => package-info.java} | 12 +-
.../regtest/{ => report}/BasicObserver.java | 25 +-
.../regtest/{ => report}/ElapsedTimeHandler.java | 18 +-
.../regtest/{ => report}/RegressionReporter.java | 32 +-
.../regtest/{ => report}/TestNGReporter.java | 16 +-
.../javatest/regtest/{ => report}/TestStats.java | 29 +-
.../sun/javatest/regtest/{ => report}/Verbose.java | 20 +-
.../regtest/{ => report}/VerboseHandler.java | 34 +-
.../javatest/regtest/{ => report}/XMLWriter.java | 18 +-
.../sun/javatest/regtest/report/i18n.properties | 22 +-
.../{BadArgs.java => report/package-info.java} | 21 +-
.../regtest/{ => tool}/AntOptionDecoder.java | 4 +-
.../com/sun/javatest/regtest/{ => tool}/Help.java | 17 +-
.../javatest/regtest/{ => tool}/JCovManager.java | 14 +-
.../sun/javatest/regtest/{ => tool}/JarFinder.java | 3 +-
.../sun/javatest/regtest/{ => tool}/Option.java | 4 +-
.../javatest/regtest/{ => tool}/OptionDecoder.java | 5 +-
.../javatest/regtest/{Main.java => tool/Tool.java} | 526 ++---
.../sun/javatest/regtest/{ => tool}/Version.java | 14 +-
.../javatest/regtest/{ => tool}/i18n.properties | 34 -
.../{BadArgs.java => tool/package-info.java} | 21 +-
.../javatest/regtest/{ => util}/GraphUtils.java | 23 +-
.../regtest/{ => util}/NaturalComparator.java | 10 +-
.../javatest/regtest/{ => util}/ProcessUtils.java | 4 +-
.../javatest/regtest/{ => util}/StreamCopier.java | 5 +-
.../javatest/regtest/{ => util}/StringUtils.java | 18 +-
.../{IgnoreKind.java => util/package-info.java} | 13 +-
.../java/lang/reflect/JTRegModuleHelper.java | 26 +-
src/share/doc/javatest/regtest/tag-spec.html | 7 +
src/share/test/javatest/regtest/Basic.java | 8 +-
.../test/javatest/regtest/BuildPatternTest.java | 4 +-
src/share/test/javatest/regtest/InterruptTest.java | 17 +-
.../test/javatest/regtest/JDKModulesTest.java | 10 +-
src/share/test/javatest/regtest/JDKOptsTest.java | 151 +-
src/share/test/javatest/regtest/OSTest.java | 4 +-
.../test/javatest/regtest/OptionDecoderTest.java | 8 +-
src/share/test/javatest/regtest/RetainTest.java | 1 +
src/share/test/javatest/regtest/StatsTest.java | 4 +-
.../javatest/regtest/data/junitTrace/NPE.java} | 26 +-
.../javatest/regtest/data/junitTrace/Pass.java} | 26 +-
.../javatest/regtest/data/junitTrace/TEST.ROOT | 0
.../javatest/regtest/data/libBuildArgs/TEST.ROOT | 23 +-
.../data/libBuildArgs/bad/LibBuildArgsTest.java} | 24 +-
.../regtest/data/libBuildArgs/bad/TEST.properties | 3 +
.../data/libBuildArgs/good/LibBuildArgsTest.java} | 24 +-
.../regtest/data/libBuildArgs/good/TEST.properties | 4 +
.../regtest/data/libBuildArgs/lib/bad/Bad1.java} | 18 +-
.../regtest/data/libBuildArgs/lib/bad/Bad2.java} | 18 +-
.../regtest/data/libBuildArgs/lib/good/Good1.java} | 22 +-
.../regtest/data/libBuildArgs/lib/good/Good2.java} | 22 +-
.../regtest/data/libBuildArgs/lib/mixed/Bad.java} | 18 +-
.../regtest/data/libBuildArgs/lib/mixed/Good.java} | 22 +-
.../regtest/data/moduleExports/ExportsPrivate.java | 68 +
.../javatest/regtest/data/moduleExports/TEST.ROOT | 0
.../javatest/regtest/data/policy/JUnit.java} | 34 +-
.../javatest/regtest/data/policy/Main.java} | 33 +-
.../test/javatest/regtest/data/policy/TEST.ROOT | 0
.../javatest/regtest/data/policy/TestNG.java} | 34 +-
.../javatest/regtest/data/policy/simple.policy} | 18 +-
.../regtest/data/rerun/std/JUnitTest.agentvm.out | 2 +-
.../regtest/data/rerun/std/TestNGTest.agentvm.out | 2 +-
.../data/rerun/testng/TestNGTest.agentvm.out | 2 +-
189 files changed, 5887 insertions(+), 5045 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