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

Fix issue causing resources within built products to be omitted from results #30

Merged
merged 1 commit into from
Nov 26, 2019

Conversation

kwridan
Copy link
Contributor

@kwridan kwridan commented Nov 25, 2019

Describe your changes

  • In the event a resource build file can't be to a path relative to the project, the file was getting omitted from the comparison results
  • Resource bundles produced by other target reside with the built products directory and don't yield relative paths to the project
  • As such when comparing projects that leverage resource bundles, the results didn't include them
  • To mitigate this we now fallback to using the file's raw path incase we can't resolve a relative path to it

Testing performed

  • Ran xcdiff on a project that contains resource bundles
  • Verified they appear in the results
  • Ran the unit tests

…results

- In the event a resource build file can't be to a path relative to the project, the file was getting omitted from the comparison results
- Resource bundles produced by other target reside with the built products directory and don't yield relative paths to the project
- As such when comparing projects that leverage resource bundles, the results didn't include them
- To mitigate this we now fallback to using the file's raw path incase we can't resolve a relative path to it

Test Plan:

- Run xcdiff on a project that contains resource bundles
- Verify they appear
- Run unit tests

Signed-off-by: Kassem Wridan <kwridan@bloomberg.net>
@kwridan kwridan merged commit ae803b9 into bloomberg:master Nov 26, 2019
@kwridan kwridan deleted the fix/bundle-resources branch November 26, 2019 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants