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

FileInPath must handle symbolic links properly #12508

Merged
merged 2 commits into from Nov 24, 2015

Conversation

wmtan
Copy link
Contributor

@wmtan wmtan commented Nov 19, 2015

This PR fixes FileInPath to work properly in the presence of symbolic links in any relevant paths.
Currently, FileInPath does not resolve symbolic links before checking if paths match. This can cause matches to be missed. Since the IB unit tests are now run with a symbolic link to the src directory,
the FWCore/PythonParameterSet unit test was failing due to this issue. This PR should fix the test.

@wmtan
Copy link
Contributor Author

wmtan commented Nov 19, 2015

@cmsbuild please test

@cmsbuild cmsbuild added this to the Next CMSSW_8_0_X milestone Nov 19, 2015
@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @wmtan for CMSSW_8_0_X.

It involves the following packages:

FWCore/ParameterSet
FWCore/PythonParameterSet
FWCore/Utilities

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

Following commands in first line of a comment are recognized

  • +1|approve[d]|sign[ed]: L1/L2's to approve it
  • -1|reject[ed]: L1/L2's to reject it
  • assign <category>[,<category>[,...]]: L1/L2's to request signatures from other categories
  • unassign <category>[,<category>[,...]]: L1/L2's to remove signatures from other categories
  • hold: L1/all L2's/release manager to mark it as on hold
  • unhold: L1/user who put this PR on hold
  • merge: L1/release managers to merge this request
  • [@cmsbuild,] please test: L1/L2 and selected users to start jenkins tests
  • [@cmsbuild,] please test with cms-sw/cmsdist#<PR>: L1/L2 and selected users to start jenkins tests using externals from cmsdist

@@ -0,0 +1,13 @@
#ifndef FWCore_Utilities_ResolveSymbolicLinks_h
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change the name of the file to start with a lower case since this isn't a class header.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@Dr15Jones
Copy link
Contributor

+1

@Dr15Jones
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

@davidlange6
Copy link
Contributor

+1
But this used to be a desirable thing NOT to do - lets discuss when I'm back

cmsbuild added a commit that referenced this pull request Nov 24, 2015
FileInPath must handle symbolic links properly
@cmsbuild cmsbuild merged commit 0fb2b44 into cms-sw:CMSSW_8_0_X Nov 24, 2015
@wmtan wmtan deleted the FileInPathFix branch November 24, 2015 22:12
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

4 participants