diff --git a/FWCore/Integration/test/AssociationMapReadTest_cfg.py b/FWCore/Integration/test/AssociationMapReadTest_cfg.py
index 576ca64e0b87c..5837e26ada95e 100644
--- a/FWCore/Integration/test/AssociationMapReadTest_cfg.py
+++ b/FWCore/Integration/test/AssociationMapReadTest_cfg.py
@@ -5,7 +5,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
diff --git a/FWCore/Integration/test/AssociationMapTest_cfg.py b/FWCore/Integration/test/AssociationMapTest_cfg.py
index 012dc2e4f1061..e5cb3bed77577 100644
--- a/FWCore/Integration/test/AssociationMapTest_cfg.py
+++ b/FWCore/Integration/test/AssociationMapTest_cfg.py
@@ -5,7 +5,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
diff --git a/FWCore/Integration/test/RefTest_cfg.py b/FWCore/Integration/test/RefTest_cfg.py
index fe7dd8539efe6..121c34f1a6eb2 100644
--- a/FWCore/Integration/test/RefTest_cfg.py
+++ b/FWCore/Integration/test/RefTest_cfg.py
@@ -9,7 +9,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(2)
diff --git a/FWCore/Integration/test/TransRefTest_cfg.py b/FWCore/Integration/test/TransRefTest_cfg.py
index 86ae5a0ae3210..d0934fa91f096 100644
--- a/FWCore/Integration/test/TransRefTest_cfg.py
+++ b/FWCore/Integration/test/TransRefTest_cfg.py
@@ -9,7 +9,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(2)
diff --git a/FWCore/Integration/test/ViewTest_cfg.py b/FWCore/Integration/test/ViewTest_cfg.py
index 6b2d272f50996..81fa79af3a989 100644
--- a/FWCore/Integration/test/ViewTest_cfg.py
+++ b/FWCore/Integration/test/ViewTest_cfg.py
@@ -9,7 +9,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(3)
diff --git a/FWCore/Integration/test/parentlessTest_cfg.py b/FWCore/Integration/test/parentlessTest_cfg.py
index 8008767d150c9..63359241a086c 100644
--- a/FWCore/Integration/test/parentlessTest_cfg.py
+++ b/FWCore/Integration/test/parentlessTest_cfg.py
@@ -9,7 +9,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(2)
diff --git a/FWCore/MessageService/bin/Standalone.cpp b/FWCore/MessageService/bin/Standalone.cpp
index 952403e346b11..3c9e5d6b6cd7e 100644
--- a/FWCore/MessageService/bin/Standalone.cpp
+++ b/FWCore/MessageService/bin/Standalone.cpp
@@ -77,18 +77,12 @@ int main(int, char* argv[]) {
"untracked PSet infos = {"
"untracked string threshold = 'INFO'"
"untracked PSet default = {untracked int32 limit = 1000000}"
- "untracked PSet FwkJob = {untracked int32 limit = 0}"
"}"
"untracked PSet warnings = {"
"untracked string threshold = 'WARNING'"
"untracked PSet default = {untracked int32 limit = 1000000}"
"}"
- "untracked vstring fwkJobReports = {'FrameworkJobReport.xml'}"
- "untracked vstring categories = {'FwkJob'}"
- "untracked PSet FrameworkJobReport.xml = {"
- "untracked PSet default = {untracked int32 limit = 0}"
- "untracked PSet FwkJob = {untracked int32 limit = 10000000}"
- "}"
+ "untracked vstring categories = {}"
"}"
"service = JobReportService{}"
"service = SiteLocalConfigService{}"
diff --git a/FWCore/MessageService/test/AAA_AtlasOfTests b/FWCore/MessageService/test/AAA_AtlasOfTests
index fb827e253301b..cf0e9ec6f1878 100644
--- a/FWCore/MessageService/test/AAA_AtlasOfTests
+++ b/FWCore/MessageService/test/AAA_AtlasOfTests
@@ -4,7 +4,7 @@ Tests marked $ are tested in both single thread and multithread running.
Tests marked % are tested with both the default and EDM_ML_DEBUG defined.
u1 $% Gives different thresholds to multiple destinations, and assigns
- limit=0 to annoying message categories preEventProcessing and FwkJob.
+ limit=0 to annoying message categories preEventProcessing and FwkTest.
Incidnetally tests noTimeStamps. Also generates a job report file
(u1_job_report.mxml).
---------- UnitTestClient_A
@@ -32,7 +32,7 @@ u5 $ Tests reset versus no reset behavior when multiple statistics
u6 $ Tests hex and other manipulators
---------- UnitTestClient_C
-u7 Filtering all but one category (for example FwkJob).
+u7 Filtering all but one category (for example FwkTest).
Creates a fwkJobReports u7_job_report.mxml as well as logs.
---------- UnitTestClient_C
diff --git a/FWCore/MessageService/test/MLexampleModule_1.cc b/FWCore/MessageService/test/MLexampleModule_1.cc
index 516be5691ef6a..3f7917f45c3ae 100644
--- a/FWCore/MessageService/test/MLexampleModule_1.cc
+++ b/FWCore/MessageService/test/MLexampleModule_1.cc
@@ -20,7 +20,7 @@ namespace edmtest {
edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
edm::LogInfo("cat_A") << "LogInfo was used to send this message";
edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
- edm::LogInfo("FwkJob") << "LogInfo was used to send a job report";
+ edm::LogInfo("FwkTest") << "LogInfo was used to send a job report";
} // MessageLoggerClient::analyze()
diff --git a/FWCore/MessageService/test/PsetValidationSamples/cat_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/cat_cfg.py
index ca7a6747f4118..3030698b22ec3 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/cat_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/cat_cfg.py
@@ -15,8 +15,7 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y' ),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B', 'cat_J', 'cat_K'),
# enabling any of these acter the first one should fail:
@@ -39,7 +38,7 @@
u1_x = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -67,7 +66,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -81,7 +80,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -90,7 +89,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/categories_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/categories_cfg.py
index 8b9b99a8ba58d..71a1abf68859e 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/categories_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/categories_cfg.py
@@ -15,18 +15,17 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
#enable one of the following -- the first should pass, the rest fail
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B'),
-# categories = cms.vstring('preEventProcessing','FwkJob','u1_x'),
-# categories = cms.vstring('preEventProcessing','FwkJob','u1_y'),
-# categories = cms.vstring('preEventProcessing','FwkJob','u1_f'),
+# categories = cms.vstring('preEventProcessing','FwkTest','u1_x'),
+# categories = cms.vstring('preEventProcessing','FwkTest','u1_y'),
+# categories = cms.vstring('preEventProcessing','FwkTest','u1_f'),
# categories = cms.untracked.int32(2),
-# categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+# categories = cms.untracked.vstring('preEventProcessing','FwkTest',
# 'cat_A','cat_B','cat_A'),
-# categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+# categories = cms.untracked.vstring('preEventProcessing','FwkTest',
# 'cat_A','cat_B','limit'),
# If the passing one above enabled, enabling this should now fail:
@@ -35,7 +34,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -49,7 +48,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -58,7 +57,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/debugModules_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/debugModules_cfg.py
index 5d776d7f1d799..e19d403f7e0d7 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/debugModules_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/debugModules_cfg.py
@@ -15,8 +15,7 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B'),
#enable one of the following -- the first THREE should pass, the rest fail
@@ -34,7 +33,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -48,7 +47,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -57,7 +56,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/dest_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/dest_cfg.py
index 1467533f1eb8b..b5e3c7d304363 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/dest_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/dest_cfg.py
@@ -15,8 +15,7 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y' ),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B'),
# enabling any of these except the first 5 should fail:
@@ -24,7 +23,7 @@
u1_x = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -53,7 +52,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -67,7 +66,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -76,7 +75,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/destlist_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/destlist_cfg.py
index b672f89bf3307..4cd491a5cbacf 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/destlist_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/destlist_cfg.py
@@ -37,7 +37,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -51,7 +51,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -60,7 +60,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -71,10 +71,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob')
+ 'FwkTest')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/fwkJRlist_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/fwkJRlist_cfg.py
index 6a654bafa5687..9fdd1b6f25d1f 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/fwkJRlist_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/fwkJRlist_cfg.py
@@ -16,21 +16,11 @@
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'),
-#enable one of the following -- the first should pass, the rest fail
-# fwkJobReports = cms.untracked.vstring( 'u1_f' ),
-# fwkJobReports = cms.vstring('cout'),
-# fwkJobReports = cms.untracked.int32(2),
-# fwkJobReports = cms.untracked.vstring('u1_warnings', 'u1_errors', 'u1_warnings'),
-# fwkJobReports = cms.untracked.vstring('cout','limit'),
-# fwkJobReports = cms.untracked.vstring('u1_y'),
-# fwkJobReports = cms.untracked.vstring('u1_x'),
- fwkJobReports = cms.untracked.vstring('u1_y','u1_x'),
-
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -44,7 +34,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -53,7 +43,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -66,7 +56,7 @@
),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob')
+ 'FwkTest')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/gpm_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/gpm_cfg.py
index 5fbcb963426b3..b902f7eb46cba 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/gpm_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/gpm_cfg.py
@@ -23,7 +23,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -37,7 +37,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -46,7 +46,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -57,10 +57,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u1_warnings',
'u1_errors',
'u1_infos',
diff --git a/FWCore/MessageService/test/PsetValidationSamples/mstjp_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/mstjp_cfg.py
index 1a39553831913..d7502fa893626 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/mstjp_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/mstjp_cfg.py
@@ -20,7 +20,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -34,7 +34,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -43,7 +43,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -54,10 +54,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u1_warnings',
'u1_errors',
'u1_infos',
diff --git a/FWCore/MessageService/test/PsetValidationSamples/statlist_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/statlist_cfg.py
index 14f0fe12fb162..80b79f23fd5ce 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/statlist_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/statlist_cfg.py
@@ -26,7 +26,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -40,7 +40,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -49,7 +49,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -60,10 +60,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob')
+ 'FwkTest')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/suppress_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/suppress_cfg.py
index b510e8f9a3262..e83009fbd1eb1 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/suppress_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/suppress_cfg.py
@@ -15,8 +15,7 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B'),
debugModules = cms.untracked.vstring('*'),
@@ -36,7 +35,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -50,7 +49,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -59,7 +58,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/threshold_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/threshold_cfg.py
index 8894ec7439569..1a86cc497fa6a 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/threshold_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/threshold_cfg.py
@@ -27,7 +27,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -41,7 +41,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -50,7 +50,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -61,10 +61,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u1_warnings',
'u1_errors',
'u1_infos',
diff --git a/FWCore/MessageService/test/PsetValidationSamples/vstring_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/vstring_cfg.py
index b2de9ef5200ee..7f5f76073a2e6 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/vstring_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/vstring_cfg.py
@@ -15,8 +15,7 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B'),
debugModules = cms.untracked.vstring('*'),
@@ -28,7 +27,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -42,7 +41,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -51,7 +50,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/PsetValidationSamples/xPSet_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/xPSet_cfg.py
index bcf916e2932c3..bd42db21dc0c1 100644
--- a/FWCore/MessageService/test/PsetValidationSamples/xPSet_cfg.py
+++ b/FWCore/MessageService/test/PsetValidationSamples/xPSet_cfg.py
@@ -15,8 +15,7 @@
destinations = cms.untracked.vstring( 'u1_warnings', 'u1_errors',
'u1_infos', 'u1_debugs', 'u1_default', 'u1_x'),
statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'),
- fwkJobReports = cms.untracked.vstring( 'u1_f' ),
- categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+ categories = cms.untracked.vstring('preEventProcessing','FwkTest',
'cat_A','cat_B'),
debugModules = cms.untracked.vstring('*'),
@@ -28,7 +27,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -42,7 +41,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -51,7 +50,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/UnitTestClient_A.cc b/FWCore/MessageService/test/UnitTestClient_A.cc
index ed4daa78b04b5..ec26caca529e9 100644
--- a/FWCore/MessageService/test/UnitTestClient_A.cc
+++ b/FWCore/MessageService/test/UnitTestClient_A.cc
@@ -23,7 +23,7 @@ namespace edmtest {
edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
edm::LogInfo("cat_A") << "LogInfo was used to send this message";
edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
- edm::LogInfo("FwkJob") << "LogInfo was used to send a job report";
+ edm::LogInfo("FwkTest") << "LogInfo was used to send a job report";
} // MessageLoggerClient::analyze()
diff --git a/FWCore/MessageService/test/UnitTestClient_A_suppTest.cc b/FWCore/MessageService/test/UnitTestClient_A_suppTest.cc
index 997572dbf5bc4..28ff7ace301f7 100644
--- a/FWCore/MessageService/test/UnitTestClient_A_suppTest.cc
+++ b/FWCore/MessageService/test/UnitTestClient_A_suppTest.cc
@@ -1,15 +1,15 @@
// UnitTestClient_A_suppTest is a variant on UnitTestClient_A
-// that adds a function call (foo()) to the end of the statemnts
-// of a LogDebug and a LogInfo. foo() has a side efffect
+// that adds a function call (foo()) to the end of the statemnts
+// of a LogDebug and a LogInfo. foo() has a side efffect
// (a write to cerr). What we are testing is whether when LogDebug
// is suppressed because EDM_ML_DEBUG is not defined, foo() is not
-// called.
-//
-// The correct behavior is that cerr will get two lines of
+// called.
+//
+// The correct behavior is that cerr will get two lines of
// foo(LogInfo) was called.
-// But cerr should get no lines of
+// But cerr should get no lines of
// foo(LogDebug) was called.
-//
+//
// Test passed 9/27/10
#include "FWCore/MessageService/test/UnitTestClient_A.h"
@@ -20,42 +20,38 @@
#include
// TEMPORARY - to test suppression
-static std::string foo(std::string const & x) {
+static std::string foo(std::string const& x) {
std::cerr << "foo(" << x << ") was called.\n";
return std::string();
}
-namespace edmtest
-{
-
-void
- UnitTestClient_A::analyze( edm::Event const & /*unused*/
- , edm::EventSetup const & /*unused*/
- )
-{
- std::string empty_;
- std::string file_ = "nameOfFile";
- LogDebug ("cat_A") << "LogDebug was used to send this message"
-// TEMPORARY change to test suppression
- << foo("LogDebug");
- LogDebug ("cat_B") << "LogDebug was used to send this other message";
- edm::LogError ("cat_A") << "LogError was used to send this message"
- << "-which is long enough to span lines but-"
- << "will not be broken up by the logger any more";
- edm::LogError ("cat_B") << "LogError was used to send this other message";
- edm::LogWarning("cat_A") << "LogWarning was used to send this message";
- edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
- edm::LogInfo ("cat_A") << "LogInfo was used to send this message"
-// TEMPORARY change to test suppression
- << foo("LogInfo");
- edm::LogInfo ("cat_B") << "LogInfo was used to send this other message";
- edm::LogInfo ("FwkJob") << "LogInfo was used to send a job report";
-
- } // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+ void UnitTestClient_A::analyze(edm::Event const& /*unused*/
+ ,
+ edm::EventSetup const& /*unused*/
+ ) {
+ std::string empty_;
+ std::string file_ = "nameOfFile";
+ LogDebug("cat_A") << "LogDebug was used to send this message"
+ // TEMPORARY change to test suppression
+ << foo("LogDebug");
+ LogDebug("cat_B") << "LogDebug was used to send this other message";
+ edm::LogError("cat_A") << "LogError was used to send this message"
+ << "-which is long enough to span lines but-"
+ << "will not be broken up by the logger any more";
+ edm::LogError("cat_B") << "LogError was used to send this other message";
+ edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+ edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
+ edm::LogInfo("cat_A") << "LogInfo was used to send this message"
+ // TEMPORARY change to test suppression
+ << foo("LogInfo");
+ edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+ edm::LogInfo("FwkTest") << "LogInfo was used to send a job report";
+
+ } // MessageLoggerClient::analyze()
} // namespace edmtest
-
using edmtest::UnitTestClient_A;
DEFINE_FWK_MODULE(UnitTestClient_A);
diff --git a/FWCore/MessageService/test/UnitTestClient_Ad.cc b/FWCore/MessageService/test/UnitTestClient_Ad.cc
index 427ca41983979..b9c23f8267232 100644
--- a/FWCore/MessageService/test/UnitTestClient_Ad.cc
+++ b/FWCore/MessageService/test/UnitTestClient_Ad.cc
@@ -25,7 +25,7 @@ namespace edmtest {
edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
edm::LogInfo("cat_A") << "LogInfo was used to send this message";
edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
- edm::LogInfo("FwkJob") << "LogInfo was used to send a job report";
+ edm::LogInfo("FwkTest") << "LogInfo was used to send a job report";
} // MessageLoggerClient::analyze()
diff --git a/FWCore/MessageService/test/UnitTestClient_D.cc b/FWCore/MessageService/test/UnitTestClient_D.cc
index 4e3ff4fef8be6..517397a3fcda8 100644
--- a/FWCore/MessageService/test/UnitTestClient_D.cc
+++ b/FWCore/MessageService/test/UnitTestClient_D.cc
@@ -14,8 +14,8 @@ namespace edmtest {
) {
edm::LogWarning("cat_A") << "This message should not appear in "
<< "the framework job report";
- edm::LogWarning("FwkJob") << "This message should appear in "
- << "the framework job report";
+ edm::LogWarning("FwkTest") << "This message should appear in "
+ << "the framework job report";
edm::LogWarning("special") << "This message should appear in "
<< "restrict but the others should not";
diff --git a/FWCore/MessageService/test/UnitTestClient_I.cc b/FWCore/MessageService/test/UnitTestClient_I.cc
index c959b84b747f1..f0f7a05f89494 100644
--- a/FWCore/MessageService/test/UnitTestClient_I.cc
+++ b/FWCore/MessageService/test/UnitTestClient_I.cc
@@ -24,7 +24,7 @@ namespace edmtest {
edm::LogInfo("cat_A") << "LogInfo was used to send this message";
edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
- edm::LogInfo("FwkJob") << "LogInfo was used to send a job report";
+ edm::LogInfo("FwkTest") << "LogInfo was used to send a job report";
} // MessageLoggerClient::analyze()
diff --git a/FWCore/MessageService/test/memory_t1_cfg.py b/FWCore/MessageService/test/memory_t1_cfg.py
index c622957755cdf..ec140197643af 100644
--- a/FWCore/MessageService/test/memory_t1_cfg.py
+++ b/FWCore/MessageService/test/memory_t1_cfg.py
@@ -27,14 +27,14 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('memory_t1_infos')
)
diff --git a/FWCore/MessageService/test/memory_t2_cfg.py b/FWCore/MessageService/test/memory_t2_cfg.py
index 1a86735d5554c..8472c5cb1d1bf 100644
--- a/FWCore/MessageService/test/memory_t2_cfg.py
+++ b/FWCore/MessageService/test/memory_t2_cfg.py
@@ -27,14 +27,14 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('memory_t1_infos')
)
diff --git a/FWCore/MessageService/test/memory_t3_cfg.py b/FWCore/MessageService/test/memory_t3_cfg.py
index 4ebb004da346d..20c019556bbba 100644
--- a/FWCore/MessageService/test/memory_t3_cfg.py
+++ b/FWCore/MessageService/test/memory_t3_cfg.py
@@ -28,14 +28,14 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('memory_t3_infos')
)
diff --git a/FWCore/MessageService/test/messageLogger_cfg.py b/FWCore/MessageService/test/messageLogger_cfg.py
index 8df6dfd06c2ab..40d0477c6e55b 100644
--- a/FWCore/MessageService/test/messageLogger_cfg.py
+++ b/FWCore/MessageService/test/messageLogger_cfg.py
@@ -12,11 +12,6 @@
process.MessageLogger = cms.Service("MessageLogger",
messageIDs = cms.untracked.vstring('unimportant',
'trkwarning'),
- anotherfile = cms.untracked.PSet(
- postBeginJob = cms.untracked.PSet(
- limit = cms.untracked.int32(0)
- )
- ),
default = cms.untracked.PSet(
limit = cms.untracked.int32(100),
timespan = cms.untracked.int32(60)
@@ -41,7 +36,6 @@
critical = cms.untracked.PSet(
threshold = cms.untracked.string('ERROR')
),
- fwkJobReports = cms.untracked.vstring('anotherfile'),
debugModules = cms.untracked.vstring('sendSomeMessages'),
categories = cms.untracked.vstring('postBeginJob'),
destinations = cms.untracked.vstring('detailedInfo',
diff --git a/FWCore/MessageService/test/timing_t_cfg.py b/FWCore/MessageService/test/timing_t_cfg.py
index 04e019f6997a0..78519c1b119d2 100644
--- a/FWCore/MessageService/test/timing_t_cfg.py
+++ b/FWCore/MessageService/test/timing_t_cfg.py
@@ -22,7 +22,7 @@
extension = cms.untracked.string('mmxml')
),
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -32,7 +32,7 @@
),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('timing_t')
)
diff --git a/FWCore/MessageService/test/u10_cfg.py b/FWCore/MessageService/test/u10_cfg.py
index 3fedd8ac152f5..6d67597f08d31 100644
--- a/FWCore/MessageService/test/u10_cfg.py
+++ b/FWCore/MessageService/test/u10_cfg.py
@@ -16,7 +16,6 @@
noTimeStamps = cms.untracked.bool(True)
),
destinations = cms.untracked.vstring('u10_warnings'),
- fwkJobReports = cms.untracked.vstring('u10_job_report')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/u11_cfg.py b/FWCore/MessageService/test/u11_cfg.py
index f957dd5f816a2..a9ad919612cbc 100644
--- a/FWCore/MessageService/test/u11_cfg.py
+++ b/FWCore/MessageService/test/u11_cfg.py
@@ -56,7 +56,7 @@
expect_non_supercede_common_specific = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
int25bydefaults = cms.untracked.PSet(
@@ -145,7 +145,7 @@
'expect_non_supercede_common_specific',
'expect_specific',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u11_overall_unnamed',
'u11_overall_specific',
'u11_supercede_specific',
diff --git a/FWCore/MessageService/test/u13_cfg.py b/FWCore/MessageService/test/u13_cfg.py
index e0d780e8062a7..d9a3e49fa741f 100644
--- a/FWCore/MessageService/test/u13_cfg.py
+++ b/FWCore/MessageService/test/u13_cfg.py
@@ -20,7 +20,7 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -34,13 +34,13 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
categories = cms.untracked.vstring('preEventProcessing',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u13_infos',
'u13_debugs')
)
diff --git a/FWCore/MessageService/test/u13d_cfg.py b/FWCore/MessageService/test/u13d_cfg.py
index 34d7588ebeea6..f915865a60e30 100644
--- a/FWCore/MessageService/test/u13d_cfg.py
+++ b/FWCore/MessageService/test/u13d_cfg.py
@@ -21,7 +21,7 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -35,13 +35,13 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
categories = cms.untracked.vstring('preEventProcessing',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u13d_infos',
'u13d_debugs')
)
diff --git a/FWCore/MessageService/test/u14_cfg.py b/FWCore/MessageService/test/u14_cfg.py
index bb14e0ea7c0b2..97857579954cc 100644
--- a/FWCore/MessageService/test/u14_cfg.py
+++ b/FWCore/MessageService/test/u14_cfg.py
@@ -41,7 +41,6 @@
limit = cms.untracked.int32(0)
)
),
- fwkJobReports = cms.untracked.vstring('u14_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing'),
destinations = cms.untracked.vstring('u14_warnings',
diff --git a/FWCore/MessageService/test/u15_cfg.py b/FWCore/MessageService/test/u15_cfg.py
index c166ee3abdec6..540a6a836564e 100644
--- a/FWCore/MessageService/test/u15_cfg.py
+++ b/FWCore/MessageService/test/u15_cfg.py
@@ -21,7 +21,7 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -35,13 +35,13 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
categories = cms.untracked.vstring('preEventProcessing',
'FwkReport',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u15_infos',
'u15_debugs')
)
diff --git a/FWCore/MessageService/test/u16-2warnings_cfg.py b/FWCore/MessageService/test/u16-2warnings_cfg.py
index b0b426394356f..ee294b861288b 100644
--- a/FWCore/MessageService/test/u16-2warnings_cfg.py
+++ b/FWCore/MessageService/test/u16-2warnings_cfg.py
@@ -26,7 +26,7 @@
extension = cms.untracked.string('mmxml')
),
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -68,7 +68,6 @@
extension = cms.untracked.string('mmlog'),
filename = cms.untracked.string('u16_altDebugs')
),
- fwkJobReports = cms.untracked.vstring('u16_job_report'),
destinations = cms.untracked.vstring('u16_warnings',
'u16_warnings2',
'u16_errors',
@@ -77,7 +76,7 @@
'u16_default'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
# produce another file u16_altWarnings.log - temporary test
u16_warnings2 = cms.untracked.PSet(
threshold = cms.untracked.string('WARNING'),
diff --git a/FWCore/MessageService/test/u16_cfg.py b/FWCore/MessageService/test/u16_cfg.py
index d881b01a040c5..337ca767745b7 100644
--- a/FWCore/MessageService/test/u16_cfg.py
+++ b/FWCore/MessageService/test/u16_cfg.py
@@ -20,12 +20,8 @@
threshold = cms.untracked.string('WARNING'),
extension = cms.untracked.string('mslog')
),
- # produce file u16_job_report.mmxml
- u16_job_report = cms.untracked.PSet(
- extension = cms.untracked.string('mmxml')
- ),
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -67,10 +63,9 @@
extension = cms.untracked.string('mmlog'),
filename = cms.untracked.string('u16_altDebugs')
),
- fwkJobReports = cms.untracked.vstring('u16_job_report'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u16_warnings',
'u16_errors',
'u16_infos',
diff --git a/FWCore/MessageService/test/u17_cfg.py b/FWCore/MessageService/test/u17_cfg.py
index 9c1f36fff0225..11c13ef6e92ff 100644
--- a/FWCore/MessageService/test/u17_cfg.py
+++ b/FWCore/MessageService/test/u17_cfg.py
@@ -18,12 +18,12 @@
statistics = cms.untracked.vstring('u17_all'),
categories = cms.untracked.vstring('cat_P',
'cat_S',
- 'FwkJob',
+ 'FwkTest',
'FwkReport'),
u17_all = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkReport = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/u19_cfg.py b/FWCore/MessageService/test/u19_cfg.py
index d455360945f89..df36eb38b4fea 100644
--- a/FWCore/MessageService/test/u19_cfg.py
+++ b/FWCore/MessageService/test/u19_cfg.py
@@ -14,7 +14,7 @@
u19_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -27,7 +27,7 @@
u19_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -35,9 +35,8 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob',
- 'ridiculously_long_category_name'),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml')
+ 'FwkTest',
+ 'ridiculously_long_category_name')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/u19d_cfg.py b/FWCore/MessageService/test/u19d_cfg.py
index 7c38be7f8b893..ae74c31adf0ad 100644
--- a/FWCore/MessageService/test/u19d_cfg.py
+++ b/FWCore/MessageService/test/u19d_cfg.py
@@ -15,7 +15,7 @@
u19d_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -28,7 +28,7 @@
u19d_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -36,9 +36,8 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob',
- 'ridiculously_long_category_name'),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml')
+ 'FwkTest',
+ 'ridiculously_long_category_name')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/u1_cfg.py b/FWCore/MessageService/test/u1_cfg.py
index f07995d745f02..5585d4efa3ef9 100644
--- a/FWCore/MessageService/test/u1_cfg.py
+++ b/FWCore/MessageService/test/u1_cfg.py
@@ -17,7 +17,7 @@
u1_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -31,7 +31,7 @@
u1_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -40,7 +40,7 @@
),
u1_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -51,10 +51,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u1_warnings',
'u1_errors',
'u1_infos',
diff --git a/FWCore/MessageService/test/u1d_cfg.py b/FWCore/MessageService/test/u1d_cfg.py
index b2a766e720bdf..102aac617c9cf 100644
--- a/FWCore/MessageService/test/u1d_cfg.py
+++ b/FWCore/MessageService/test/u1d_cfg.py
@@ -18,7 +18,7 @@
u1d_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -32,7 +32,7 @@
u1d_debugs = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -41,7 +41,7 @@
),
u1d_default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -52,10 +52,9 @@
threshold = cms.untracked.string('ERROR'),
noTimeStamps = cms.untracked.bool(True)
),
- fwkJobReports = cms.untracked.vstring('u1d_job_report.mxml'),
debugModules = cms.untracked.vstring('*'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u1d_warnings',
'u1d_errors',
'u1d_infos',
diff --git a/FWCore/MessageService/test/u21_cfg.py b/FWCore/MessageService/test/u21_cfg.py
index a2ae69956597b..d8976d00b9652 100644
--- a/FWCore/MessageService/test/u21_cfg.py
+++ b/FWCore/MessageService/test/u21_cfg.py
@@ -11,14 +11,14 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
u21_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -26,7 +26,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob',
+ 'FwkTest',
'importantInfo',
'routineInfo'),
u21_warnings = cms.untracked.PSet(
@@ -43,7 +43,7 @@
preEventProcessing = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
threshold = cms.untracked.string('INFO')
diff --git a/FWCore/MessageService/test/u22_cfg.py b/FWCore/MessageService/test/u22_cfg.py
index c5f36eed3a9c3..cbf7c39cd7cac 100644
--- a/FWCore/MessageService/test/u22_cfg.py
+++ b/FWCore/MessageService/test/u22_cfg.py
@@ -13,14 +13,14 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
u22_warnings = cms.untracked.PSet(
threshold = cms.untracked.string('WARNING'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -28,7 +28,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u22_warnings')
)
diff --git a/FWCore/MessageService/test/u23_cfg.py b/FWCore/MessageService/test/u23_cfg.py
index 0483fc548996a..157d13771c301 100644
--- a/FWCore/MessageService/test/u23_cfg.py
+++ b/FWCore/MessageService/test/u23_cfg.py
@@ -12,7 +12,7 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -20,7 +20,7 @@
u23_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -28,7 +28,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob',
+ 'FwkTest',
'timer',
'trace'),
destinations = cms.untracked.vstring('u23_infos')
diff --git a/FWCore/MessageService/test/u24_cfg.py b/FWCore/MessageService/test/u24_cfg.py
index 05d6941cc1971..cb8d7f1b1d1e4 100644
--- a/FWCore/MessageService/test/u24_cfg.py
+++ b/FWCore/MessageService/test/u24_cfg.py
@@ -12,7 +12,7 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -32,7 +32,7 @@
filename = cms.untracked.string('u24')
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u24_warnings',
'u24_errors')
)
diff --git a/FWCore/MessageService/test/u25_cfg.py b/FWCore/MessageService/test/u25_cfg.py
index a4ece22582662..9ad7c1f29b4c7 100644
--- a/FWCore/MessageService/test/u25_cfg.py
+++ b/FWCore/MessageService/test/u25_cfg.py
@@ -15,11 +15,11 @@
destinations = cms.untracked.vstring('u25_only'),
statistics = cms.untracked.vstring('u25_only'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
u25_only = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/u27_cfg.py b/FWCore/MessageService/test/u27_cfg.py
index 581ac99ee0416..30ff731583e4d 100644
--- a/FWCore/MessageService/test/u27_cfg.py
+++ b/FWCore/MessageService/test/u27_cfg.py
@@ -17,14 +17,14 @@
statistics = cms.untracked.vstring('u27_infos'),
messageSummaryToJobReport = cms.untracked.bool(True),
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
u27_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -32,7 +32,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob',
+ 'FwkTest',
'timer',
'trace'),
destinations = cms.untracked.vstring('u27_infos')
diff --git a/FWCore/MessageService/test/u30Lumi_cfg.py b/FWCore/MessageService/test/u30Lumi_cfg.py
index 9ff385ccdae1f..b0aada1b13966 100644
--- a/FWCore/MessageService/test/u30Lumi_cfg.py
+++ b/FWCore/MessageService/test/u30Lumi_cfg.py
@@ -9,14 +9,14 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(1000)
)
),
u30_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(1000)
),
preEventProcessing = cms.untracked.PSet(
@@ -24,7 +24,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u30_infos')
)
diff --git a/FWCore/MessageService/test/u30_cfg.py b/FWCore/MessageService/test/u30_cfg.py
index 758329a5f624b..7987b73cc7e2a 100644
--- a/FWCore/MessageService/test/u30_cfg.py
+++ b/FWCore/MessageService/test/u30_cfg.py
@@ -12,14 +12,14 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(1000)
)
),
u30_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -27,7 +27,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u30_infos')
)
diff --git a/FWCore/MessageService/test/u31_cfg.py b/FWCore/MessageService/test/u31_cfg.py
index 1e2e22eb14336..ad58a269bb0a0 100644
--- a/FWCore/MessageService/test/u31_cfg.py
+++ b/FWCore/MessageService/test/u31_cfg.py
@@ -10,7 +10,7 @@
process.MessageLogger = cms.Service("MessageLogger",
default = cms.untracked.PSet(
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
@@ -18,7 +18,7 @@
u31_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -26,7 +26,7 @@
)
),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob',
+ 'FwkTest',
'timer',
'trace'),
destinations = cms.untracked.vstring('u31_infos')
diff --git a/FWCore/MessageService/test/u3_cfg.py b/FWCore/MessageService/test/u3_cfg.py
index 38394ff0e0ed8..e3c85812ddac8 100644
--- a/FWCore/MessageService/test/u3_cfg.py
+++ b/FWCore/MessageService/test/u3_cfg.py
@@ -15,7 +15,7 @@
u3_infos = cms.untracked.PSet(
threshold = cms.untracked.string('INFO'),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
preEventProcessing = cms.untracked.PSet(
@@ -24,7 +24,7 @@
),
statistics = cms.untracked.vstring('u3_statistics'),
categories = cms.untracked.vstring('preEventProcessing',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u3_infos')
)
diff --git a/FWCore/MessageService/test/u7_cfg.py b/FWCore/MessageService/test/u7_cfg.py
index 0b8af91f2b1f8..2da2ab11c88b2 100644
--- a/FWCore/MessageService/test/u7_cfg.py
+++ b/FWCore/MessageService/test/u7_cfg.py
@@ -1,5 +1,5 @@
# Unit test configuration file for MessageLogger service:
-# Filtering all but one category (for example FwkJob)
+# Filtering all but one category (for example FwkTest)
import FWCore.ParameterSet.Config as cms
@@ -11,9 +11,6 @@
process.load("FWCore.MessageService.test.Services_cff")
process.MessageLogger = cms.Service("MessageLogger",
- u7_job_report = cms.untracked.PSet(
- extension = cms.untracked.string("mxml")
- ),
u7_restrict = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
@@ -25,15 +22,14 @@
),
u7_log = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
),
destinations = cms.untracked.vstring('u7_log',
'u7_restrict'),
- categories = cms.untracked.vstring('FwkJob',
- 'special'),
- fwkJobReports = cms.untracked.vstring('u7_job_report')
+ categories = cms.untracked.vstring('FwkTest',
+ 'special')
)
process.maxEvents = cms.untracked.PSet(
diff --git a/FWCore/MessageService/test/u8_cfg.py b/FWCore/MessageService/test/u8_cfg.py
index 1935efef733f2..ef7b84881ceb8 100644
--- a/FWCore/MessageService/test/u8_cfg.py
+++ b/FWCore/MessageService/test/u8_cfg.py
@@ -38,7 +38,7 @@
expect_non_supercede_common_specific = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
limit = cms.untracked.int32(5),
@@ -118,7 +118,7 @@
'expect_supercede_specific',
'expect_non_supercede_common_specific',
'expect_specific',
- 'FwkJob'),
+ 'FwkTest'),
destinations = cms.untracked.vstring('u8_overall_unnamed',
'u8_overall_specific',
'u8_supercede_specific',
diff --git a/FWCore/MessageService/test/u9_cfg.py b/FWCore/MessageService/test/u9_cfg.py
index db24ecbc8fe2f..78855aa34f0e8 100644
--- a/FWCore/MessageService/test/u9_cfg.py
+++ b/FWCore/MessageService/test/u9_cfg.py
@@ -14,10 +14,10 @@
process.MessageLogger.destinations = ['warnings', 'infos']
process.MessageLogger.statistics = ['warnings', 'infos']
-process.MessageLogger.fwkJobReports = ['job_report']
+process.MessageLogger.categories.append('FwkTest')
process.MessageLogger.default = cms.untracked.PSet(
noTimeStamps = cms.untracked.bool(False),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
limit = cms.untracked.int32(-1)
@@ -34,7 +34,7 @@
limit = cms.untracked.int32(2)
),
noTimeStamps = cms.untracked.bool(True),
- FwkJob = cms.untracked.PSet(
+ FwkTest = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
)
diff --git a/FWCore/MessageService/test/unit_test_outputs/u28_output.log b/FWCore/MessageService/test/unit_test_outputs/u28_output.log
index a9525441b5215..73b50b8c45ec6 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u28_output.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u28_output.log
@@ -17,7 +17,7 @@ LogInfo was used to send this message
%MSG-i cat_B: UnitTestClient_A:sendSomeMessages Run: 1 Event: 1
LogInfo was used to send this other message
%MSG
-%MSG-i FwkJob: UnitTestClient_A:sendSomeMessages Run: 1 Event: 1
+%MSG-i FwkTest: UnitTestClient_A:sendSomeMessages Run: 1 Event: 1
LogInfo was used to send a job report
%MSG
Begin processing the 2nd record. Run 1, Event 2, LumiSection 1 on stream 0 at {Timestamp}
@@ -39,7 +39,7 @@ LogInfo was used to send this message
%MSG-i cat_B: UnitTestClient_A:sendSomeMessages Run: 1 Event: 2
LogInfo was used to send this other message
%MSG
-%MSG-i FwkJob: UnitTestClient_A:sendSomeMessages Run: 1 Event: 2
+%MSG-i FwkTest: UnitTestClient_A:sendSomeMessages Run: 1 Event: 2
LogInfo was used to send a job report
%MSG
Begin processing the 3rd record. Run 1, Event 3, LumiSection 1 on stream 0 at {Timestamp}
@@ -61,7 +61,7 @@ LogInfo was used to send this message
%MSG-i cat_B: UnitTestClient_A:sendSomeMessages Run: 1 Event: 3
LogInfo was used to send this other message
%MSG
-%MSG-i FwkJob: UnitTestClient_A:sendSomeMessages Run: 1 Event: 3
+%MSG-i FwkTest: UnitTestClient_A:sendSomeMessages Run: 1 Event: 3
LogInfo was used to send a job report
%MSG
diff --git a/FWCore/MessageService/test/unit_test_outputs/u3_statistics.log b/FWCore/MessageService/test/unit_test_outputs/u3_statistics.log
index d6ae5e5ca46f9..8bb515e16b6ae 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u3_statistics.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u3_statistics.log
@@ -5,7 +5,7 @@ MessageLogger Summary
type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
- 1 FwkJob -i UnitTestClient_A 3* 3
+ 1 FwkTest -i UnitTestClient_A 3* 3
2 cat_A -i UnitTestClient_A 3 3
3 cat_B -i UnitTestClient_A 3 3
4 FwkReport -f AfterSource 3 3
@@ -18,7 +18,7 @@ MessageLogger Summary
type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
- 1 FwkJob 1/1 1/2 1/3
+ 1 FwkTest 1/1 1/2 1/3
2 cat_A 1/1 1/2 1/3
3 cat_B 1/1 1/2 1/3
4 FwkReport AfterSource AfterSource AfterSource
diff --git a/FWCore/MessageService/test/unit_test_outputs/u4_another.log b/FWCore/MessageService/test/unit_test_outputs/u4_another.log
index 571890404b49a..53f78d2040074 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u4_another.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u4_another.log
@@ -5,7 +5,7 @@ MessageLogger Summary
type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
- 1 FwkJob -i UnitTestClient_A 3* 3
+ 1 FwkTest -i UnitTestClient_A 3* 3
2 cat_A -i UnitTestClient_A 3* 3
3 cat_B -i UnitTestClient_A 3* 3
4 FwkReport -f AfterSource 3* 3
@@ -18,7 +18,7 @@ MessageLogger Summary
type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
- 1 FwkJob 1/1 1/2 1/3
+ 1 FwkTest 1/1 1/2 1/3
2 cat_A 1/1 1/2 1/3
3 cat_B 1/1 1/2 1/3
4 FwkReport AfterSource AfterSource AfterSource
diff --git a/FWCore/Services/bin/edmTracerLogToSimpleConfig.py b/FWCore/Services/bin/edmTracerLogToSimpleConfig.py
index 3726f0cb6870a..106bece31b75f 100644
--- a/FWCore/Services/bin/edmTracerLogToSimpleConfig.py
+++ b/FWCore/Services/bin/edmTracerLogToSimpleConfig.py
@@ -122,7 +122,7 @@ def finish(self):
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.MessageLogger.destinations = ['cerr']
process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
process.MessageLogger.cerr.FwkReport.reportEvery = 50000
process.MessageLogger.cerr.threshold = 'WARNING'
""")