Merge pull request #34161 from Dr15Jones/fixSourceAlias

Fix use of EDAlias on 'source'
cms-sw · Jun 17, 2021 · c479817 · c479817
2 parents efbd83a + f5fcc7f
commit c479817
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/FWCore/Framework/src/EDConsumerBase.cc b/FWCore/Framework/src/EDConsumerBase.cc
@@ -450,6 +450,10 @@ namespace {
             modules.push_back(it->second);
           }
           foundInLabelsToDesc = true;
+        } else {
+          if (label == "source") {
+            foundInLabelsToDesc = true;
+          }
         }
       }
       if (foundInLabelsToDesc) {

diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml
@@ -447,4 +447,6 @@
   <test name="TestFWCoreIntegrationInterProcess" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/test_TestInterProcessProd_cfg.py"/>
 
   <test name="TestFWCoreIntegrationPutOrMerge" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/putOrMergeTest_cfg.py"/>
+
+  <test name="TestFWCoreIntegrationInputSourceAlias" command="cmsRun ${LOCALTOP}//src/FWCore/Integration/test/inputSource_alias_Test_cfg.py"/>
 </environment>
diff --git a/FWCore/Integration/test/inputSource_alias_Test_cfg.py b/FWCore/Integration/test/inputSource_alias_Test_cfg.py
@@ -0,0 +1,23 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("TEST")
+
+process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(2)
+)
+
+process.source = cms.Source("ThingSource"
+)
+
+process.thing = cms.EDAlias(source = cms.VPSet( cms.PSet( type = cms.string("edmtestThings")) ) )
+
+
+process.OtherThing = cms.EDProducer("OtherThingProducer",
+    thingTag = cms.InputTag('thing')
+)
+
+process.Analysis = cms.EDAnalyzer("OtherThingAnalyzer")
+
+process.p = cms.Path(process.OtherThing * process.Analysis)