changeset in /hg/icedtea: Merge up to revision 873 from IcedTea6.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:14:19 PDT 2008
changeset d76a48233b57 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d76a48233b57
description:
Merge up to revision 873 from IcedTea6.
diffstat:
512 files changed, 172906 insertions(+), 136 deletions(-)
.hgignore | 4
ChangeLog | 30
Makefile.am | 155
Makefile.in | 161
javac.in | 2
test/jtreg/JavaTest.cmdMgrs.lst | 34
test/jtreg/JavaTest.toolMgrs.lst | 30
test/jtreg/META-INF/MANIFEST.MF | 3
test/jtreg/README | 29
test/jtreg/com/sun/interview/AllFilesFileFilter.java | 60
test/jtreg/com/sun/interview/Checklist.java | 124
test/jtreg/com/sun/interview/ChoiceArrayQuestion.java | 385 +
test/jtreg/com/sun/interview/ChoiceQuestion.java | 380 +
test/jtreg/com/sun/interview/CompositeQuestion.java | 63
test/jtreg/com/sun/interview/DirectoryFileFilter.java | 61
test/jtreg/com/sun/interview/ErrorQuestion.java | 56
test/jtreg/com/sun/interview/ExtensionFileFilter.java | 162
test/jtreg/com/sun/interview/FileFilter.java | 53
test/jtreg/com/sun/interview/FileListQuestion.java | 376 +
test/jtreg/com/sun/interview/FileQuestion.java | 299 +
test/jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java | 61
test/jtreg/com/sun/interview/FinalQuestion.java | 63
test/jtreg/com/sun/interview/FloatQuestion.java | 399 +
test/jtreg/com/sun/interview/InetAddressQuestion.java | 408 +
test/jtreg/com/sun/interview/IntQuestion.java | 376 +
test/jtreg/com/sun/interview/Interview.java | 2397 ++++++++
test/jtreg/com/sun/interview/InterviewQuestion.java | 126
test/jtreg/com/sun/interview/InterviewSet.java | 262
test/jtreg/com/sun/interview/ListQuestion.java | 637 ++
test/jtreg/com/sun/interview/NullQuestion.java | 174
test/jtreg/com/sun/interview/Properties2.java | 346 +
test/jtreg/com/sun/interview/PropertiesQuestion.java | 1420 ++++
test/jtreg/com/sun/interview/Question.java | 513 +
test/jtreg/com/sun/interview/StringListQuestion.java | 284
test/jtreg/com/sun/interview/StringQuestion.java | 230
test/jtreg/com/sun/interview/TreeQuestion.java | 388 +
test/jtreg/com/sun/interview/WizEdit.java | 346 +
test/jtreg/com/sun/interview/WizPrint.java | 1091 +++
test/jtreg/com/sun/interview/YesNoQuestion.java | 94
test/jtreg/com/sun/interview/i18n.properties | 86
test/jtreg/com/sun/interview/package.html | 142
test/jtreg/com/sun/interview/wizard/ActionDocListener.java | 59
test/jtreg/com/sun/interview/wizard/ActionListDataListener.java | 59
test/jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java | 214
test/jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java | 246
test/jtreg/com/sun/interview/wizard/EditableList.java | 368 +
test/jtreg/com/sun/interview/wizard/Exporter.java | 74
test/jtreg/com/sun/interview/wizard/FileList.java | 134
test/jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java | 113
test/jtreg/com/sun/interview/wizard/FileQuestionRenderer.java | 163
test/jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java | 196
test/jtreg/com/sun/interview/wizard/I18NResourceBundle.java | 185
test/jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java | 392 +
test/jtreg/com/sun/interview/wizard/InfoPanel.java | 89
test/jtreg/com/sun/interview/wizard/IntQuestionRenderer.java | 165
test/jtreg/com/sun/interview/wizard/ListQuestionRenderer.java | 244
test/jtreg/com/sun/interview/wizard/NullQuestionRenderer.java | 43
test/jtreg/com/sun/interview/wizard/PathPanel.java | 1192 ++++
test/jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java | 341 +
test/jtreg/com/sun/interview/wizard/QuestionPanel.java | 668 ++
test/jtreg/com/sun/interview/wizard/QuestionRenderer.java | 70
test/jtreg/com/sun/interview/wizard/RenderingUtilities.java | 460 +
test/jtreg/com/sun/interview/wizard/SearchDialog.java | 330 +
test/jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java | 78
test/jtreg/com/sun/interview/wizard/StringQuestionRenderer.java | 104
test/jtreg/com/sun/interview/wizard/SwingFileFilter.java | 61
test/jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java | 701 ++
test/jtreg/com/sun/interview/wizard/TypeInPanel.java | 159
test/jtreg/com/sun/interview/wizard/WizPane.java | 517 +
test/jtreg/com/sun/interview/wizard/Wizard.java | 1095 +++
test/jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java | 126
test/jtreg/com/sun/interview/wizard/i18n.properties | 294
test/jtreg/com/sun/interview/wizard/package.html | 57
test/jtreg/com/sun/javatest/AllTestsFilter.java | 52
test/jtreg/com/sun/javatest/BasicParameters.java | 817 ++
test/jtreg/com/sun/javatest/Command.java | 72
test/jtreg/com/sun/javatest/CompositeFilter.java | 234
test/jtreg/com/sun/javatest/DefaultTestRunner.java | 254
test/jtreg/com/sun/javatest/Deprecated.java | 45
test/jtreg/com/sun/javatest/EditJTI.java | 713 ++
test/jtreg/com/sun/javatest/EditLinks.java | 564 +
test/jtreg/com/sun/javatest/ExcludeList.java | 1212 ++++
test/jtreg/com/sun/javatest/ExcludeListFilter.java | 81
test/jtreg/com/sun/javatest/ExcludeListUpdateHandler.java | 167
test/jtreg/com/sun/javatest/FileParameters.java | 571 +
test/jtreg/com/sun/javatest/Harness.java | 964 +++
test/jtreg/com/sun/javatest/HarnessHttpHandler.java | 590 +
test/jtreg/com/sun/javatest/InitialUrlFilter.java | 170
test/jtreg/com/sun/javatest/InterviewParameters.java | 1676 +++++
test/jtreg/com/sun/javatest/InterviewPropagator.java | 821 ++
test/jtreg/com/sun/javatest/JavaTestError.java | 224
test/jtreg/com/sun/javatest/JavaTestSecurityManager.java | 204
test/jtreg/com/sun/javatest/Keywords.java | 595 ++
test/jtreg/com/sun/javatest/KeywordsFilter.java | 80
test/jtreg/com/sun/javatest/LastRunFilter.java | 145
test/jtreg/com/sun/javatest/LastRunInfo.java | 176
test/jtreg/com/sun/javatest/ObservableTestFilter.java | 82
test/jtreg/com/sun/javatest/Parameters.java | 948 +++
test/jtreg/com/sun/javatest/ProductInfo.java | 200
test/jtreg/com/sun/javatest/ResourceTable.java | 118
test/jtreg/com/sun/javatest/Script.java | 1350 ++++
test/jtreg/com/sun/javatest/Status.java | 361 +
test/jtreg/com/sun/javatest/StatusFilter.java | 124
test/jtreg/com/sun/javatest/TRT_HttpHandler.java | 210
test/jtreg/com/sun/javatest/TRT_Iterator.java | 954 +++
test/jtreg/com/sun/javatest/TRT_TreeNode.java | 1749 +++++
test/jtreg/com/sun/javatest/TemplateUtilities.java | 218
test/jtreg/com/sun/javatest/Test.java | 64
test/jtreg/com/sun/javatest/TestDescription.java | 576 +
test/jtreg/com/sun/javatest/TestEnvContext.java | 356 +
test/jtreg/com/sun/javatest/TestEnvironment.java | 692 ++
test/jtreg/com/sun/javatest/TestFilter.java | 139
test/jtreg/com/sun/javatest/TestFinder.java | 738 ++
test/jtreg/com/sun/javatest/TestFinderQueue.java | 714 ++
test/jtreg/com/sun/javatest/TestResult.java | 2685 +++++++++
test/jtreg/com/sun/javatest/TestResultCache.java | 815 ++
test/jtreg/com/sun/javatest/TestResultTable.java | 2938 +++++++++
test/jtreg/com/sun/javatest/TestRunner.java | 227
test/jtreg/com/sun/javatest/TestSuite.java | 1344 ++++
test/jtreg/com/sun/javatest/Trace.java | 175
test/jtreg/com/sun/javatest/WorkDirectory.java | 942 +++
test/jtreg/com/sun/javatest/agent/ActiveAgentCommand.java | 117
test/jtreg/com/sun/javatest/agent/ActiveAgentPool.java | 647 ++
test/jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java | 88
test/jtreg/com/sun/javatest/agent/ActiveModeOptions.java | 79
test/jtreg/com/sun/javatest/agent/Agent.java | 1162 +++
test/jtreg/com/sun/javatest/agent/AgentApplet.java | 304 +
test/jtreg/com/sun/javatest/agent/AgentClassLoader.java | 88
test/jtreg/com/sun/javatest/agent/AgentClassLoader2.java | 63
test/jtreg/com/sun/javatest/agent/AgentFrame.java | 337 +
test/jtreg/com/sun/javatest/agent/AgentMain.java | 556 +
test/jtreg/com/sun/javatest/agent/AgentManager.java | 646 ++
test/jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java | 231
test/jtreg/com/sun/javatest/agent/AgentMonitorTool.java | 516 +
test/jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java | 111
test/jtreg/com/sun/javatest/agent/AgentPanel.java | 1048 +++
test/jtreg/com/sun/javatest/agent/BadValue.java | 65
test/jtreg/com/sun/javatest/agent/Connection.java | 83
test/jtreg/com/sun/javatest/agent/ConnectionFactory.java | 88
test/jtreg/com/sun/javatest/agent/Deck.java | 96
test/jtreg/com/sun/javatest/agent/Deprecated.java | 52
test/jtreg/com/sun/javatest/agent/Folder.java | 343 +
test/jtreg/com/sun/javatest/agent/Icon.java | 114
test/jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java | 134
test/jtreg/com/sun/javatest/agent/Map.java | 197
test/jtreg/com/sun/javatest/agent/ModeOptions.java | 56
test/jtreg/com/sun/javatest/agent/PassiveAgentCommand.java | 135
test/jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java | 91
test/jtreg/com/sun/javatest/agent/PassiveModeOptions.java | 73
test/jtreg/com/sun/javatest/agent/SocketConnection.java | 169
test/jtreg/com/sun/javatest/agent/i18n.properties | 95
test/jtreg/com/sun/javatest/agent/package.html | 60
test/jtreg/com/sun/javatest/audit/Audit.java | 739 ++
test/jtreg/com/sun/javatest/audit/AuditCommandManager.java | 140
test/jtreg/com/sun/javatest/audit/AuditPane.java | 82
test/jtreg/com/sun/javatest/audit/AuditTool.java | 373 +
test/jtreg/com/sun/javatest/audit/AuditToolManager.java | 105
test/jtreg/com/sun/javatest/audit/BadChecksumPane.java | 47
test/jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java | 48
test/jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java | 47
test/jtreg/com/sun/javatest/audit/BadTestsPane.java | 47
test/jtreg/com/sun/javatest/audit/ListPane.java | 100
test/jtreg/com/sun/javatest/audit/OptionsDialog.java | 371 +
test/jtreg/com/sun/javatest/audit/SummaryPane.java | 287
test/jtreg/com/sun/javatest/audit/i18n.properties | 189
test/jtreg/com/sun/javatest/audit/package.html | 44
test/jtreg/com/sun/javatest/batch/BatchManager.java | 119
test/jtreg/com/sun/javatest/batch/ObserverCommand.java | 182
test/jtreg/com/sun/javatest/batch/RunTestsCommand.java | 416 +
test/jtreg/com/sun/javatest/batch/i18n.properties | 75
test/jtreg/com/sun/javatest/batch/package.html | 44
test/jtreg/com/sun/javatest/cof/COF1_0.xsd | 548 +
test/jtreg/com/sun/javatest/cof/COF2_0_2.xsd | 779 ++
test/jtreg/com/sun/javatest/cof/COFApplication.java | 102
test/jtreg/com/sun/javatest/cof/COFApplications.java | 69
test/jtreg/com/sun/javatest/cof/COFData.java | 94
test/jtreg/com/sun/javatest/cof/COFEnvironment.java | 584 +
test/jtreg/com/sun/javatest/cof/COFEnvironments.java | 124
test/jtreg/com/sun/javatest/cof/COFItem.java | 170
test/jtreg/com/sun/javatest/cof/COFOS.java | 178
test/jtreg/com/sun/javatest/cof/COFReportAnnotation.java | 160
test/jtreg/com/sun/javatest/cof/COFReportAnnotations.java | 114
test/jtreg/com/sun/javatest/cof/COFSWEntities.java | 114
test/jtreg/com/sun/javatest/cof/COFSWEntity.java | 248
test/jtreg/com/sun/javatest/cof/COFStatus.java | 193
test/jtreg/com/sun/javatest/cof/COFTest.java | 594 +
test/jtreg/com/sun/javatest/cof/COFTestAttribute.java | 181
test/jtreg/com/sun/javatest/cof/COFTestAttributes.java | 116
test/jtreg/com/sun/javatest/cof/COFTestCase.java | 346 +
test/jtreg/com/sun/javatest/cof/COFTestCases.java | 133
test/jtreg/com/sun/javatest/cof/COFTestSuite.java | 143
test/jtreg/com/sun/javatest/cof/COFTestSuites.java | 126
test/jtreg/com/sun/javatest/cof/ID.java | 56
test/jtreg/com/sun/javatest/cof/Main.java | 377 +
test/jtreg/com/sun/javatest/cof/Report.java | 424 +
test/jtreg/com/sun/javatest/cof/i18n.properties | 54
test/jtreg/com/sun/javatest/diff/DiffReader.java | 40
test/jtreg/com/sun/javatest/diff/HTMLReporter.java | 305 +
test/jtreg/com/sun/javatest/diff/Help.java | 445 +
test/jtreg/com/sun/javatest/diff/Main.java | 318 +
test/jtreg/com/sun/javatest/diff/MultiMap.java | 174
test/jtreg/com/sun/javatest/diff/ReportReader.java | 126
test/jtreg/com/sun/javatest/diff/Reporter.java | 76
test/jtreg/com/sun/javatest/diff/SimpleReporter.java | 163
test/jtreg/com/sun/javatest/diff/StatusComparator.java | 79
test/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java | 113
test/jtreg/com/sun/javatest/diff/i18n.properties | 125
test/jtreg/com/sun/javatest/exec/AbstractCellEditor.java | 87
test/jtreg/com/sun/javatest/exec/AccessWrapper.java | 73
test/jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java | 96
test/jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java | 107
test/jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java | 926 +++
test/jtreg/com/sun/javatest/exec/BP_Model.java | 78
test/jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java | 980 +++
test/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java | 1353 ++++
test/jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java | 1077 +++
test/jtreg/com/sun/javatest/exec/BranchPanel.java | 579 +
test/jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java | 276
test/jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java | 612 ++
test/jtreg/com/sun/javatest/exec/CE_ExecutionPane.java | 253
test/jtreg/com/sun/javatest/exec/CE_FullView.java | 265
test/jtreg/com/sun/javatest/exec/CE_KeywordsPane.java | 527 +
test/jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java | 203
test/jtreg/com/sun/javatest/exec/CE_StdPane.java | 82
test/jtreg/com/sun/javatest/exec/CE_StdView.java | 274
test/jtreg/com/sun/javatest/exec/CE_TemplateDialog.java | 320 +
test/jtreg/com/sun/javatest/exec/CE_TestsPane.java | 255
test/jtreg/com/sun/javatest/exec/CE_View.java | 72
test/jtreg/com/sun/javatest/exec/ChecklistBrowser.java | 296
test/jtreg/com/sun/javatest/exec/ConfigEditor.java | 1401 ++++
test/jtreg/com/sun/javatest/exec/ConfigHandler.java | 1198 ++++
test/jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java | 209
test/jtreg/com/sun/javatest/exec/ContextManager.java | 583 +
test/jtreg/com/sun/javatest/exec/CustomTestResultViewer.java | 104
test/jtreg/com/sun/javatest/exec/DetailsBrowser.java | 154
test/jtreg/com/sun/javatest/exec/ET_FilterHandler.java | 591 +
test/jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java | 221
test/jtreg/com/sun/javatest/exec/EnvironmentBrowser.java | 351 +
test/jtreg/com/sun/javatest/exec/ExcludeListBrowser.java | 371 +
test/jtreg/com/sun/javatest/exec/ExecModel.java | 93
test/jtreg/com/sun/javatest/exec/ExecTool.java | 1471 ++++
test/jtreg/com/sun/javatest/exec/ExecToolManager.java | 815 ++
test/jtreg/com/sun/javatest/exec/FeatureManager.java | 89
test/jtreg/com/sun/javatest/exec/FileSystemTableModel.java | 245
test/jtreg/com/sun/javatest/exec/FileTable.java | 99
test/jtreg/com/sun/javatest/exec/FileType.java | 85
test/jtreg/com/sun/javatest/exec/FilesPane.java | 134
test/jtreg/com/sun/javatest/exec/FilterConfig.java | 858 ++
test/jtreg/com/sun/javatest/exec/FilterSelectionHandler.java | 425 +
test/jtreg/com/sun/javatest/exec/JavaTestContextMenu.java | 134
test/jtreg/com/sun/javatest/exec/JavaTestMenuManager.java | 133
test/jtreg/com/sun/javatest/exec/JavaTestToolBar.java | 236
test/jtreg/com/sun/javatest/exec/LogViewer.java | 1349 ++++
test/jtreg/com/sun/javatest/exec/LogViewerTools.java | 191
test/jtreg/com/sun/javatest/exec/MessageStrip.java | 383 +
test/jtreg/com/sun/javatest/exec/Monitor.java | 60
test/jtreg/com/sun/javatest/exec/MonitorState.java | 334 +
test/jtreg/com/sun/javatest/exec/MultiFormatPane.java | 971 +++
test/jtreg/com/sun/javatest/exec/MultiSelectPanel.java | 177
test/jtreg/com/sun/javatest/exec/NavigationPane.java | 365 +
test/jtreg/com/sun/javatest/exec/NewReportDialog.java | 1428 ++++
test/jtreg/com/sun/javatest/exec/ParameterFilter.java | 238
test/jtreg/com/sun/javatest/exec/PrefsPane.java | 195
test/jtreg/com/sun/javatest/exec/ProgressMeter.java | 343 +
test/jtreg/com/sun/javatest/exec/ProgressMonitor.java | 632 ++
test/jtreg/com/sun/javatest/exec/PropertiesBrowser.java | 310 +
test/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java | 280
test/jtreg/com/sun/javatest/exec/QuickStartWizard.java | 1263 ++++
test/jtreg/com/sun/javatest/exec/RenderingUtilities.java | 185
test/jtreg/com/sun/javatest/exec/ReportBrowser.java | 164
test/jtreg/com/sun/javatest/exec/ReportHandler.java | 311 +
test/jtreg/com/sun/javatest/exec/RunProgressMonitor.java | 160
test/jtreg/com/sun/javatest/exec/RunTestsHandler.java | 527 +
test/jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java | 53
test/jtreg/com/sun/javatest/exec/TP_DescSubpanel.java | 62
test/jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java | 86
test/jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java | 124
test/jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java | 84
test/jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java | 806 ++
test/jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java | 415 +
test/jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java | 138
test/jtreg/com/sun/javatest/exec/TP_Subpanel.java | 78
test/jtreg/com/sun/javatest/exec/TT_NodeCache.java | 871 ++
test/jtreg/com/sun/javatest/exec/TT_Renderer.java | 329 +
test/jtreg/com/sun/javatest/exec/TU_ViewManager.java | 395 +
test/jtreg/com/sun/javatest/exec/TemplateParameterFilter.java | 119
test/jtreg/com/sun/javatest/exec/TestPanel.java | 423 +
test/jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java | 124
test/jtreg/com/sun/javatest/exec/TestTree.java | 252
test/jtreg/com/sun/javatest/exec/TestTreeModel.java | 1243 ++++
test/jtreg/com/sun/javatest/exec/TestTreePanel.java | 1832 ++++++
test/jtreg/com/sun/javatest/exec/ToolBarManager.java | 259
test/jtreg/com/sun/javatest/exec/ToolBarPanel.java | 162
test/jtreg/com/sun/javatest/exec/TreePanelModel.java | 97
test/jtreg/com/sun/javatest/exec/WorkDirChooseTool.java | 1088 +++
test/jtreg/com/sun/javatest/exec/i18n.properties | 1837 ++++++
test/jtreg/com/sun/javatest/exec/package.html | 43
test/jtreg/com/sun/javatest/finder/BinaryTestFinder.java | 547 +
test/jtreg/com/sun/javatest/finder/BinaryTestWriter.java | 860 ++
test/jtreg/com/sun/javatest/finder/ChameleonTestFinder.java | 450 +
test/jtreg/com/sun/javatest/finder/CommentStream.java | 85
test/jtreg/com/sun/javatest/finder/ExpandTestFinder.java | 348 +
test/jtreg/com/sun/javatest/finder/HTMLCommentStream.java | 84
test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java | 627 ++
test/jtreg/com/sun/javatest/finder/JavaCommentStream.java | 161
test/jtreg/com/sun/javatest/finder/ReverseTestFinder.java | 121
test/jtreg/com/sun/javatest/finder/ShScriptCommentStream.java | 83
test/jtreg/com/sun/javatest/finder/ShowTests.java | 291
test/jtreg/com/sun/javatest/finder/TagTestFinder.java | 388 +
test/jtreg/com/sun/javatest/finder/i18n.properties | 69
test/jtreg/com/sun/javatest/finder/package.html | 45
test/jtreg/com/sun/javatest/httpd/HttpdServer.java | 194
test/jtreg/com/sun/javatest/httpd/JThttpProvider.java | 148
test/jtreg/com/sun/javatest/httpd/PageGenerator.java | 252
test/jtreg/com/sun/javatest/httpd/ProviderRegistry.java | 494 +
test/jtreg/com/sun/javatest/httpd/RequestHandler.java | 178
test/jtreg/com/sun/javatest/httpd/RootRegistry.java | 136
test/jtreg/com/sun/javatest/httpd/httpURL.java | 318 +
test/jtreg/com/sun/javatest/httpd/i18n.properties | 45
test/jtreg/com/sun/javatest/i18n.properties | 460 +
test/jtreg/com/sun/javatest/interview/BasicInterviewParameters.java | 433 +
test/jtreg/com/sun/javatest/interview/ConcurrencyInterview.java | 104
test/jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java | 63
test/jtreg/com/sun/javatest/interview/EnvironmentInterview.java | 385 +
test/jtreg/com/sun/javatest/interview/ExcludeListInterview.java | 605 ++
test/jtreg/com/sun/javatest/interview/KeywordsInterview.java | 304 +
test/jtreg/com/sun/javatest/interview/LegacyParameters.java | 88
test/jtreg/com/sun/javatest/interview/PriorStatusInterview.java | 225
test/jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java | 270
test/jtreg/com/sun/javatest/interview/TestsInterview.java | 434 +
test/jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java | 106
test/jtreg/com/sun/javatest/interview/i18n.properties | 176
test/jtreg/com/sun/javatest/interview/package.html | 46
test/jtreg/com/sun/javatest/lib/APIScript.java | 114
test/jtreg/com/sun/javatest/lib/Deprecated.java | 52
test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java | 77
test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java | 155
test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java | 317 +
test/jtreg/com/sun/javatest/lib/KeywordScript.java | 235
test/jtreg/com/sun/javatest/lib/MultiStatus.java | 246
test/jtreg/com/sun/javatest/lib/MultiTest.java | 314 +
test/jtreg/com/sun/javatest/lib/ProcessCommand.java | 462 +
test/jtreg/com/sun/javatest/lib/ReportScript.java | 59
test/jtreg/com/sun/javatest/lib/StdTestScript.java | 223
test/jtreg/com/sun/javatest/lib/TestCases.java | 275
test/jtreg/com/sun/javatest/logging/ErrorDialogHandler.java | 217
test/jtreg/com/sun/javatest/logging/FileEvent.java | 51
test/jtreg/com/sun/javatest/logging/FileListener.java | 34
test/jtreg/com/sun/javatest/logging/FilteredLogModel.java | 392 +
test/jtreg/com/sun/javatest/logging/JTFormatter.java | 104
test/jtreg/com/sun/javatest/logging/LogModel.java | 502 +
test/jtreg/com/sun/javatest/logging/LoggerFactory.java | 58
test/jtreg/com/sun/javatest/logging/ObservedFile.java | 194
test/jtreg/com/sun/javatest/logging/WorkDirLogHandler.java | 148
test/jtreg/com/sun/javatest/logging/i18n.properties | 51
test/jtreg/com/sun/javatest/mrep/BrowserPane.java | 585 +
test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java | 263
test/jtreg/com/sun/javatest/mrep/ConflictResolver.java | 38
test/jtreg/com/sun/javatest/mrep/FilesPane.java | 472 +
test/jtreg/com/sun/javatest/mrep/Merger.java | 127
test/jtreg/com/sun/javatest/mrep/OptionsDialog.java | 204
test/jtreg/com/sun/javatest/mrep/OptionsPane.java | 504 +
test/jtreg/com/sun/javatest/mrep/ReportDirChooser.java | 298 +
test/jtreg/com/sun/javatest/mrep/ReportTool.java | 697 ++
test/jtreg/com/sun/javatest/mrep/ReportToolManager.java | 91
test/jtreg/com/sun/javatest/mrep/Scheme.java | 100
test/jtreg/com/sun/javatest/mrep/TestResultDescr.java | 78
test/jtreg/com/sun/javatest/mrep/XMLReportReader.java | 95
test/jtreg/com/sun/javatest/mrep/XMLReportWriter.java | 279
test/jtreg/com/sun/javatest/mrep/i18n.properties | 200
test/jtreg/com/sun/javatest/package.html | 61
test/jtreg/com/sun/javatest/regtest/Action.java | 530 +
test/jtreg/com/sun/javatest/regtest/AntOptionDecoder.java | 93
test/jtreg/com/sun/javatest/regtest/AppletAction.java | 631 ++
test/jtreg/com/sun/javatest/regtest/AppletWrapper.java | 650 ++
test/jtreg/com/sun/javatest/regtest/BadArgs.java | 38
test/jtreg/com/sun/javatest/regtest/BuildAction.java | 226
test/jtreg/com/sun/javatest/regtest/CheckFiles.java | 150
test/jtreg/com/sun/javatest/regtest/CleanAction.java | 146
test/jtreg/com/sun/javatest/regtest/CompileAction.java | 601 ++
test/jtreg/com/sun/javatest/regtest/GetSystemProperty.java | 40
test/jtreg/com/sun/javatest/regtest/Help.java | 490 +
test/jtreg/com/sun/javatest/regtest/IgnoreAction.java | 111
test/jtreg/com/sun/javatest/regtest/IgnoreKind.java | 35
test/jtreg/com/sun/javatest/regtest/JDK.java | 88
test/jtreg/com/sun/javatest/regtest/Main.java | 1779 +++++
test/jtreg/com/sun/javatest/regtest/MainAction.java | 714 ++
test/jtreg/com/sun/javatest/regtest/MainWrapper.java | 186
test/jtreg/com/sun/javatest/regtest/Option.java | 97
test/jtreg/com/sun/javatest/regtest/OptionDecoder.java | 184
test/jtreg/com/sun/javatest/regtest/ParseException.java | 51
test/jtreg/com/sun/javatest/regtest/RegressionEnvironment.java | 49
test/jtreg/com/sun/javatest/regtest/RegressionObserver.java | 327 +
test/jtreg/com/sun/javatest/regtest/RegressionParameters.java | 599 ++
test/jtreg/com/sun/javatest/regtest/RegressionScript.java | 925 +++
test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java | 148
test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java | 562 +
test/jtreg/com/sun/javatest/regtest/RegressionTestSuite.java | 180
test/jtreg/com/sun/javatest/regtest/ShellAction.java | 282
test/jtreg/com/sun/javatest/regtest/StringArray.java | 182
test/jtreg/com/sun/javatest/regtest/StringUtils.java | 45
test/jtreg/com/sun/javatest/regtest/TestRunException.java | 52
test/jtreg/com/sun/javatest/regtest/Verbose.java | 130
test/jtreg/com/sun/javatest/regtest/i18n.properties | 326 +
test/jtreg/com/sun/javatest/report/ConfigSection.java | 510 +
test/jtreg/com/sun/javatest/report/CustomReport.java | 390 +
test/jtreg/com/sun/javatest/report/HTMLReport.java | 292
test/jtreg/com/sun/javatest/report/HTMLSection.java | 92
test/jtreg/com/sun/javatest/report/PlainTextReport.java | 112
test/jtreg/com/sun/javatest/report/Report.java | 1096 +++
test/jtreg/com/sun/javatest/report/ReportDirChooser.java | 289
test/jtreg/com/sun/javatest/report/ReportFormat.java | 45
test/jtreg/com/sun/javatest/report/ReportManager.java | 265
test/jtreg/com/sun/javatest/report/ReportModel.java | 34
test/jtreg/com/sun/javatest/report/ReportWriter.java | 191
test/jtreg/com/sun/javatest/report/ResultSection.java | 263
test/jtreg/com/sun/javatest/report/StatisticsSection.java | 228
test/jtreg/com/sun/javatest/report/StringArrayComparator.java | 55
test/jtreg/com/sun/javatest/report/TestResultsByFileComparator.java | 73
test/jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleComparator.java | 58
test/jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java | 53
test/jtreg/com/sun/javatest/report/XMLReport.java | 471 +
test/jtreg/com/sun/javatest/report/XMLReportMaker.java | 609 ++
test/jtreg/com/sun/javatest/report/i18n.properties | 135
test/jtreg/com/sun/javatest/report/package.html | 39
test/jtreg/com/sun/javatest/stylesheet.css | 33
test/jtreg/com/sun/javatest/tool/Command.java | 280
test/jtreg/com/sun/javatest/tool/CommandContext.java | 1028 +++
test/jtreg/com/sun/javatest/tool/CommandManager.java | 107
test/jtreg/com/sun/javatest/tool/CommandParser.java | 343 +
test/jtreg/com/sun/javatest/tool/ConfigManager.java | 1435 ++++
test/jtreg/com/sun/javatest/tool/CustomPropagationController.java | 113
test/jtreg/com/sun/javatest/tool/Deck.java | 127
test/jtreg/com/sun/javatest/tool/DeskView.java | 833 ++
test/jtreg/com/sun/javatest/tool/Desktop.java | 1507 +++++
test/jtreg/com/sun/javatest/tool/DesktopManager.java | 88
test/jtreg/com/sun/javatest/tool/DesktopPrefsPane.java | 404 +
test/jtreg/com/sun/javatest/tool/EditableFileList.java | 146
test/jtreg/com/sun/javatest/tool/EditableList.java | 466 +
test/jtreg/com/sun/javatest/tool/EnvironmentManager.java | 145
test/jtreg/com/sun/javatest/tool/FileChooser.java | 129
test/jtreg/com/sun/javatest/tool/FileHistory.java | 398 +
test/jtreg/com/sun/javatest/tool/FileOpener.java | 90
test/jtreg/com/sun/javatest/tool/FocusMonitor.java | 711 ++
test/jtreg/com/sun/javatest/tool/HelpLink.java | 195
test/jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java | 59
test/jtreg/com/sun/javatest/tool/HelpManager.java | 278
test/jtreg/com/sun/javatest/tool/HelpMenu.java | 306 +
test/jtreg/com/sun/javatest/tool/HttpManager.java | 99
test/jtreg/com/sun/javatest/tool/I18NUtils.java | 265
test/jtreg/com/sun/javatest/tool/IconFactory.java | 770 ++
test/jtreg/com/sun/javatest/tool/IconLabel.java | 131
test/jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java | 57
test/jtreg/com/sun/javatest/tool/LogManager.java | 112
test/jtreg/com/sun/javatest/tool/MDIDeskView.java | 587 +
test/jtreg/com/sun/javatest/tool/Main.java | 506 +
test/jtreg/com/sun/javatest/tool/ManagerLoader.java | 148
test/jtreg/com/sun/javatest/tool/PieChart.java | 231
test/jtreg/com/sun/javatest/tool/Preferences.java | 770 ++
test/jtreg/com/sun/javatest/tool/SDIDeskView.java | 494 +
test/jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java | 298 +
test/jtreg/com/sun/javatest/tool/Startup.java | 207
test/jtreg/com/sun/javatest/tool/TabDeskView.java | 528 +
test/jtreg/com/sun/javatest/tool/TestSuiteChooser.java | 261
test/jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java | 125
test/jtreg/com/sun/javatest/tool/Tool.java | 361 +
test/jtreg/com/sun/javatest/tool/ToolAction.java | 243
test/jtreg/com/sun/javatest/tool/ToolDialog.java | 719 ++
test/jtreg/com/sun/javatest/tool/ToolManager.java | 232
test/jtreg/com/sun/javatest/tool/TreeSelectionPane.java | 995 +++
test/jtreg/com/sun/javatest/tool/UIFactory.java | 2972 ++++++++++
test/jtreg/com/sun/javatest/tool/VerboseCommand.java | 159
test/jtreg/com/sun/javatest/tool/WDC_FileFilter.java | 48
test/jtreg/com/sun/javatest/tool/WDC_FileView.java | 66
test/jtreg/com/sun/javatest/tool/WorkDirChooser.java | 352 +
test/jtreg/com/sun/javatest/tool/i18n.properties | 538 +
test/jtreg/com/sun/javatest/tool/package.html | 49
test/jtreg/com/sun/javatest/util/BackupPolicy.java | 262
test/jtreg/com/sun/javatest/util/BackupUtil.java | 340 +
test/jtreg/com/sun/javatest/util/Debug.java | 492 +
test/jtreg/com/sun/javatest/util/DirectoryClassLoader.java | 226
test/jtreg/com/sun/javatest/util/DynamicArray.java | 273
test/jtreg/com/sun/javatest/util/ExitCount.java | 77
test/jtreg/com/sun/javatest/util/Fifo.java | 144
test/jtreg/com/sun/javatest/util/FileFilter.java | 43
test/jtreg/com/sun/javatest/util/FileInfoCache.java | 134
test/jtreg/com/sun/javatest/util/HTMLWriter.java | 558 +
test/jtreg/com/sun/javatest/util/HelpTree.java | 510 +
test/jtreg/com/sun/javatest/util/I18NResourceBundle.java | 171
test/jtreg/com/sun/javatest/util/LineParser.java | 288
test/jtreg/com/sun/javatest/util/LogFile.java | 172
test/jtreg/com/sun/javatest/util/MainAppletContext.java | 133
test/jtreg/com/sun/javatest/util/MainFrame.java | 251
test/jtreg/com/sun/javatest/util/OrderedTwoWayTable.java | 135
test/jtreg/com/sun/javatest/util/PathClassLoader.java | 208
test/jtreg/com/sun/javatest/util/PrefixMap.java | 169
test/jtreg/com/sun/javatest/util/Properties.java | 395 +
test/jtreg/com/sun/javatest/util/PropertyArray.java | 723 ++
test/jtreg/com/sun/javatest/util/ReadAheadIterator.java | 350 +
test/jtreg/com/sun/javatest/util/SortedProperties.java | 58
test/jtreg/com/sun/javatest/util/StringArray.java | 203
test/jtreg/com/sun/javatest/util/SysEnv.java | 176
test/jtreg/com/sun/javatest/util/TextStream.java | 97
test/jtreg/com/sun/javatest/util/TextWriter.java | 281
test/jtreg/com/sun/javatest/util/Timer.java | 219
test/jtreg/com/sun/javatest/util/WrapWriter.java | 191
test/jtreg/com/sun/javatest/util/WriterStream.java | 159
test/jtreg/com/sun/javatest/util/XMLWriter.java | 358 +
test/jtreg/com/sun/javatest/util/i18n.properties | 32
test/jtreg/com/sun/javatest/util/package.html | 39
test/jtreg/legal/copyright.txt | 22
test/jtreg/legal/license.txt | 347 +
diffs (truncated from 175425 to 500 lines):
diff -r 02845a2e61df -r d76a48233b57 .hgignore
--- a/.hgignore Thu May 29 20:29:18 2008 +0100
+++ b/.hgignore Thu May 29 20:53:59 2008 +0100
@@ -22,6 +22,10 @@ jvm.cfg
jvm.cfg
ergo.c
hotspot-tools/
+test/hotspot
+test/jdk
+test/langtools
+test/jtreg/classes
rt/com/sun/jdi/AbsentInformationException.java
rt/com/sun/jdi/Accessible.java
rt/com/sun/jdi/ArrayReference.java
diff -r 02845a2e61df -r d76a48233b57 ChangeLog
--- a/ChangeLog Thu May 29 20:29:18 2008 +0100
+++ b/ChangeLog Thu May 29 20:53:59 2008 +0100
@@ -224,6 +224,11 @@ 2008-05-23 Andrew John Hughes <gnu_and
repositories)
* Makefile.in: Regenerated.
+2008-05-23 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Updated jtreg to use correct javac and jar.
+ * Makefile.in: Regenerated.
+
2008-05-22 Lillian Angel <langel at redhat.com>
* Makefile.am: Updated conditions to use JAVAC.
@@ -249,7 +254,30 @@ 2008-05-19 Andrew John Hughes <gnu_and
OpenJDK Mercurial repository after merge,
and upgrade to b26.
* Makefile.in: Regenerated.
-
+
+2008-05-19 Mark Wielaard <mark at klomp.org>
+
+ * test/jtreg/com/sun/javatest/lib/*.java: Added.
+ * .hgignore: Add test/hotspot, test/jdk, test/langtools and
+ test/jtreg/classes
+
+2008-05-19 Mark Wielaard <mark at klomp.org>
+
+ * test/jtreg/*: New jtreg and jtharness sources.
+ * Makefile.am (distclean-local): Add clean-jtreg clean-jtreg-reports.
+ (.PHONY): Likewise.
+ (EXTRA_DIST): Add test/jtreg.
+ (stamps/jtreg.stamp): New target.
+ (clean-jtreg): Likewise.
+ (check-hotspot): Likewise.
+ (check-langtools): Likewise.
+ (check-jdk): Likewise.
+ (clean-jtreg-reports): Likewise.
+ (jtregcheck): Likewise.
+ (check-local): Likewise.
+ (jtreg): Likewise.
+ * Makefile.in: Regenerated.
+
2008-05-16 Mark Wielaard <mark at klomp.org>
* patches/icedtea-sparc.patch: Merge os_linux_sparc.cpp patch hunks.
diff -r 02845a2e61df -r d76a48233b57 Makefile.am
--- a/Makefile.am Thu May 29 20:29:18 2008 +0100
+++ b/Makefile.am Thu May 29 20:53:59 2008 +0100
@@ -11,7 +11,7 @@ endif
all-local: icedtea-against-icedtea
-distclean-local: clean-copy
+distclean-local: clean-copy clean-jtreg clean-jtreg-reports
rm -rf stamps
rm -f rt-source-files.txt \
hotspot-tools-source-files.txt \
@@ -34,12 +34,15 @@ install:
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-shared-objects \
clean-copy clean-hotspot-tools clean-rt clean-gcjwebplugin \
- hotspot hotspot-helper clean-extra
+ hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc tools-copy contrib ports \
patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
- patches/icedtea-cacao.patch $(OPENJDK_PATCHES)
+ patches/icedtea-cacao.patch $(OPENJDK_PATCHES) \
+ javaws.png javaws.desktop patches/icedtea-netx-plugin.patch \
+ overlays extra jconsole.desktop policytool.desktop
+ test/jtreg
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
# name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -833,16 +836,17 @@ hotspot-tools-source-files.txt: stamps/c
stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
stamps/generated.stamp
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
- @$< ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+ -source 1.5 \
+ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+ -bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -bootclasspath '' -source 1.6 \
+ -source 1.5 \
-sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
- @$< ; \
+ -bootclasspath '' @$< ; \
fi
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -856,7 +860,7 @@ clean-hotspot-tools:
# tools.jar
bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib/
- if ! test -f stamps/icedtea-ecj.stamp ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-C lib/hotspot-tools org -C lib/hotspot-tools java \
@@ -879,16 +883,17 @@ rt-source-files.txt: stamps/clone.stamp
stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
mkdir -p lib/rt
- if ! test -f stamps/icedtea-ecj.stamp ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
- @$< ; \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.5 \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -bootclasspath '' -source 1.6 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
- @$< ; \
+ -source 1.5 \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -bootclasspath '' @$< ; \
fi
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
@@ -903,13 +908,13 @@ clean-rt:
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt net; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAR) cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt net -C lib/rt sun; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
fi
if test -d bootstrap/ecj/jre/lib ; \
then \
@@ -923,16 +928,17 @@ stamps/extra-class-files.stamp: extra-so
stamps/extra-class-files.stamp: extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p extra-lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
+ -source 1.5 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath '' @extra-source-files.txt ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
+ -source 1.5 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath '' @extra-source-files.txt ; \
fi
cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
@@ -945,13 +951,12 @@ clean-extra:
rm -f extra-source-files.txt
extra-lib/about.jar: stamps/extra-class-files.stamp
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
$(JAR) cf $@ -C extra-lib net ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
fi
-
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
if test "$(ENABLE_PLUGIN)" == "yes" ; \
@@ -966,37 +971,54 @@ clean-gcjwebplugin:
clean-gcjwebplugin:
rm -f gcjwebplugin.so
-#extra tools
-stamps/tools.stamp: stamps/tools-class-files.stamp
- touch stamps/tools.stamp
-
-tools-source-files.txt: stamps/clone.stamp
- find tools -name '*.java' | sort > $@
-
-stamps/tools-class-files.stamp: tools-source-files.txt \
- stamps/rt-class-files.stamp
- mkdir -p lib/tools
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- fi
- cp tools/default.jnlp lib/tools
- cp -R tools/netx/jnlp/resources lib/tools/netx/jnlp
- mkdir -p stamps
- touch stamps/tools-class-files.stamp
-
-clean-tools:
- rm -rf lib/tools
- rm -rf stamps/tools-class-files.stamp
- rm -rf tools-source-files.txt
+# jtreg
+
+stamps/jtreg.stamp:
+ rm -rf test/jtreg/classes
+ mkdir -p test/jtreg/classes
+ $(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
+ -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
+ (cd test/jtreg; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
+ META-INF/MANIFEST.MF \
+ legal README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
+ `find com -type f -a -not -name '*.java'` \
+ -C classes com)
+ mkdir -p stamps
+ touch $@
+
+clean-jtreg:
+ rm -rf test/jtreg/classes
+ rm -f test/jtreg.jar
+ rm -f stamps/jtreg.stamp
+
+check-hotspot: jtreg
+ mkdir -p test/hotspot/JTwork test/hotspot/JTreport
+ bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ -w:test/hotspot/JTwork -r:test/hotspot/JTreport \
+ -jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+ `pwd`/openjdk/hotspot/test
+
+check-langtools: jtreg
+ mkdir -p test/langtools/JTwork test/langtools/JTreport
+ bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ -w:test/langtools/JTwork -r:test/langtools/JTreport \
+ -jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+ `pwd`/openjdk/langtools/test
+
+check-jdk: jtreg
+ mkdir -p test/jdk/JTwork test/jdk/JTreport
+ bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ -w:test/jdk/JTwork -r:test/jdk/JTreport \
+ -jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+ `pwd`/openjdk/jdk/test
+
+clean-jtreg-reports:
+ rm -rf test/hotspot test/langtools test/jdk
+
+jtregcheck: jtreg check-hotspot check-langtools check-jdk
+
+check-local: jtregcheck
# Target Aliases
# ===============
@@ -1049,3 +1071,4 @@ ports-ecj: stamps/ports-ecj.stamp
clean: distclean-local
+jtreg: stamps/jtreg.stamp
diff -r 02845a2e61df -r d76a48233b57 Makefile.in
--- a/Makefile.in Thu May 29 20:29:18 2008 +0100
+++ b/Makefile.in Thu May 29 20:53:59 2008 +0100
@@ -257,7 +257,9 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc tools-copy contrib ports \
patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
- patches/icedtea-cacao.patch $(OPENJDK_PATCHES)
+ patches/icedtea-cacao.patch $(OPENJDK_PATCHES) \
+ javaws.png javaws.desktop patches/icedtea-netx-plugin.patch \
+ overlays extra jconsole.desktop policytool.desktop
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -656,6 +658,7 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile all-local
installdirs:
@@ -739,9 +742,9 @@ uninstall-am:
.MAKE: install-am install-strip
-.PHONY: all all-am all-local am--refresh check check-am clean \
- clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: all all-am all-local am--refresh check check-am check-local \
+ clean clean-generic dist dist-all dist-bzip2 dist-gzip \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-local distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
@@ -758,7 +761,7 @@ uninstall-am:
all-local: icedtea-against-icedtea
-distclean-local: clean-copy
+distclean-local: clean-copy clean-jtreg clean-jtreg-reports
rm -rf stamps
rm -f rt-source-files.txt \
hotspot-tools-source-files.txt \
@@ -781,7 +784,8 @@ install:
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-shared-objects \
clean-copy clean-hotspot-tools clean-rt clean-gcjwebplugin \
- hotspot hotspot-helper clean-extra
+ hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
+ test/jtreg
env:
@echo 'unset JAVA_HOME'
@@ -1272,16 +1276,17 @@ hotspot-tools-source-files.txt: stamps/c
stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
stamps/generated.stamp
- if ! test -f stamps/icedtea-ecj.stamp ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
- @$< ; \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+ -source 1.5 \
+ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+ -bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -bootclasspath '' -source 1.6 \
+ -source 1.5 \
-sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
- @$< ; \
+ -bootclasspath '' @$< ; \
fi
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -1295,7 +1300,7 @@ clean-hotspot-tools:
# tools.jar
bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib/
- if ! test -f stamps/icedtea-ecj.stamp ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-C lib/hotspot-tools org -C lib/hotspot-tools java \
@@ -1318,16 +1323,17 @@ rt-source-files.txt: stamps/clone.stamp
stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
mkdir -p lib/rt
- if ! test -f stamps/icedtea-ecj.stamp ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
- @$< ; \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.5 \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -bootclasspath '' -source 1.6 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
- @$< ; \
+ -source 1.5 \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -bootclasspath '' @$< ; \
fi
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
@@ -1342,13 +1348,13 @@ clean-rt:
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt net; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAR) cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt net -C lib/rt sun; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
fi
if test -d bootstrap/ecj/jre/lib ; \
then \
@@ -1362,16 +1368,17 @@ stamps/extra-class-files.stamp: extra-so
stamps/extra-class-files.stamp: extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p extra-lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
+ -source 1.5 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath '' @extra-source-files.txt ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
+ -source 1.5 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath '' @extra-source-files.txt ; \
fi
cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
@@ -1384,13 +1391,12 @@ clean-extra:
rm -f extra-source-files.txt
extra-lib/about.jar: stamps/extra-class-files.stamp
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
$(JAR) cf $@ -C extra-lib net ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
fi
-
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
if test "$(ENABLE_PLUGIN)" == "yes" ; \
@@ -1405,37 +1411,54 @@ clean-gcjwebplugin:
clean-gcjwebplugin:
rm -f gcjwebplugin.so
-#extra tools
-stamps/tools.stamp: stamps/tools-class-files.stamp
- touch stamps/tools.stamp
-
-tools-source-files.txt: stamps/clone.stamp
- find tools -name '*.java' | sort > $@
-
-stamps/tools-class-files.stamp: tools-source-files.txt \
- stamps/rt-class-files.stamp
- mkdir -p lib/tools
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
More information about the distro-pkg-dev
mailing list