test(bzlmod): Make some tests bzlmod compatible with Bazel@HEAD#1482
Merged
rickeylev merged 3 commits intobazel-contrib:mainfrom Oct 11, 2023
Merged
test(bzlmod): Make some tests bzlmod compatible with Bazel@HEAD#1482rickeylev merged 3 commits intobazel-contrib:mainfrom
rickeylev merged 3 commits intobazel-contrib:mainfrom
Conversation
aignas
approved these changes
Oct 10, 2023
A few tests weren't compatible with bzlmod, so would fail when it was enabled. The various causes and fixes are: * Under bzlmod, `runfiles.CurrentRepository()` returns the empty string for the main repository. To fix, an environment variable is used to tell the test whether bzlmod is enabled or not. * Accessing data files through `TEST_SRCDIR` directly is error-prone under bzlmod because the directory name within runfiles changes from the workspace name to `_main`. To fix, use the runfiles libraries, which know how to map apparent repo names to the actual directory name. In the integration tests, the runfiles library isn't available, so just check for the `_main` directory instead. Work towards bazel-contrib#1469
2e61251 to
bf03733
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A few tests weren't compatible with bzlmod, so would fail when it was enabled. The various causes and fixes are:
Under bzlmod,
runfiles.CurrentRepository()returns the empty string for the main repository. To fix, an environment variable is used to tell the test whether bzlmod is enabled or not.Accessing data files through
TEST_SRCDIRdirectly is error-prone under bzlmod because the directory name within runfiles changes from the workspace name to_main. To fix, use the runfiles libraries, which know how to map apparent repo names to the actual directory name. In the integration tests, the runfiles library isn't available, so just check for the_maindirectory instead.Work towards #1469