Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply Modifier.toReplaceWith only if chosen #13220

Merged
merged 1 commit into from Feb 9, 2016

Conversation

Dr15Jones
Copy link
Contributor

Only run the code associated with Modifier.toReplaceWith if and only if the Modifier in question has been chosen.

Only run the code associated with Modifier.toReplaceWith if and only if the Modifier in question has been chosen.
@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 8, 2016

A new Pull Request was created by @Dr15Jones (Chris Jones) for CMSSW_8_0_X.

It involves the following packages:

FWCore/ParameterSet

@cmsbuild, @smuzaffar, @Dr15Jones, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @wddgit, @wmtan this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@Dr15Jones
Copy link
Contributor Author

please test

@Dr15Jones
Copy link
Contributor Author

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 8, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/11068/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 8, 2016

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@Dr15Jones
Copy link
Contributor Author

@davidlange6 this is the fix for the already merged #13198. This commit contains the needed unit test to prove that when chose the toReplaceWith makes the replacement and if not chosen (the test that was missing) it is not applied.

@Dr15Jones
Copy link
Contributor Author

@makortel Thanks for catching this Matti (and sorry it ate up your debugging time :( )

@makortel
Copy link
Contributor

makortel commented Feb 8, 2016

Thanks Chris for the quick fix!

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 8, 2016

-1
Tested at: 3e1ae46
I found an error when building:

                 from /afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc493/external/gcc/4.9.3/include/c++/4.9.3/istream:38,
                 from /afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc493/external/gcc/4.9.3/include/c++/4.9.3/sstream:38,
                 from /afs/cern.ch/cms/sw/ReleaseCandidates/vol1/slc6_amd64_gcc493/cms/cmssw-patch/CMSSW_8_0_X_2016-02-07-2300/src/FWCore/Utilities/interface/Exception.h:36,
                 from /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/CondCore/CondDB/interface/Exception.h:4,
                 from /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/CondCore/CondDB/src/Exception.cc:1:
/afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc493/external/gcc/4.9.3/include/c++/4.9.3/x86_64-redhat-linux-gnu/bits/gthr.h:148:31: error: /afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc493/external/gcc/4.9.3/include/c++/4.9.3/x86_64-redhat-linux-gnu/bits/gthr-default.h: Bad address
 #include 
                               ^
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/CondCore/CondDB/src/GTEditor.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/CondCore/CondDB/src/FileUtils.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/CondCore/CondDB/src/GTProxy.cc 


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13220/11068/summary.html

@Dr15Jones
Copy link
Contributor Author

Since no C++ code was changed, it is not possible that this pull request caused the problem with the test :).

@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 8, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/11076/console

@davidlt
Copy link
Contributor

davidlt commented Feb 8, 2016

This machine is known to yield such behaviour.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2016

-1
Tested at: 3e1ae46
I found an error when building:

>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1EmEtScaleOnlineProd.cc 
>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1HfRingEtScaleOnlineProd.cc 
>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1HtMissScaleOnlineProd.cc 
>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1JetEtScaleOnlineProd.cc 
gmake: **\* [tmp/slc6_amd64_gcc493/src/L1TriggerConfig/L1ScalesProducers/src/L1TriggerConfigL1ScalesProducers/L1MuGMTScalesProducer.o] Segmentation fault
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1JetEtScaleOnlineProd.cc:23:66: error: /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/CondTools/L1Trigger/interface/L1ConfigOnlineProdBase.h: Bad address
 #include "CondTools/L1Trigger/interface/L1ConfigOnlineProdBase.h"
                                                                  ^
gmake: **\* [tmp/slc6_amd64_gcc493/src/L1TriggerConfig/L1ScalesProducers/src/L1TriggerConfigL1ScalesProducers/L1MuScalesTester.o] Segmentation fault
>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1MuTriggerPtScaleOnlineProducer.cc 
>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-07-2300/src/L1TriggerConfig/L1ScalesProducers/src/L1MuTriggerPtScaleProducer.cc 


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13220/11076/summary.html

@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/11081/console

davidlange6 added a commit that referenced this pull request Feb 9, 2016
Apply Modifier.toReplaceWith only if chosen
@davidlange6 davidlange6 merged commit 3a1a160 into cms-sw:CMSSW_8_0_X Feb 9, 2016
@Dr15Jones Dr15Jones deleted the fixToReplaceWith branch February 15, 2016 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants