Repository navigation
[bazel] Make //codepropertygraph:tests run the actual tests #1870
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
14 changes: 14 additions & 0 deletions
14
codepropertygraph/src/test/java/io/shiftleft/utils/CpgRunfilesLocatorJava.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package io.shiftleft.utils; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Optional; | ||
|
|
||
| // This class is only used in the sbt build where the runfiles location is not a | ||
| // build concept and thus handled on a case by case basis. | ||
| // The sbt implementation just returns empty to indicate that the runfiles | ||
| // cannot be retrieved. | ||
| class CpgRunfilesLocatorJava { | ||
| static Optional<String> resolve(String path) throws IOException { | ||
| return Optional.empty(); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
codepropertygraph/src/test/javaBazel/io/shiftleft/utils/CpgRunfilesLocatorJava.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package io.shiftleft.utils; | ||
|
|
||
| import com.google.devtools.build.runfiles.AutoBazelRepository; | ||
| import com.google.devtools.build.runfiles.Runfiles; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Optional; | ||
|
|
||
| // This class is only part of the Bazel build. | ||
| @AutoBazelRepository | ||
| class CpgRunfilesLocatorJava { | ||
| static Optional<String> resolve(String path) throws IOException { | ||
| // The AutoBazelRepository_CpgRunfilesLocatorJava class is auto generated based on the @AutoBazelRepository | ||
| // annotation. | ||
| Runfiles runfiles = Runfiles.preload().withSourceRepository(AutoBazelRepository_CpgRunfilesLocatorJava.NAME); | ||
| String resolvedPath = runfiles.rlocation(path); | ||
| if (resolvedPath != null && Files.exists(Path.of(resolvedPath))) { | ||
| return Optional.of(resolvedPath); | ||
| } else { | ||
| return Optional.empty(); | ||
| } | ||
| } | ||
| } |
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
11 changes: 11 additions & 0 deletions
11
codepropertygraph/src/test/scala/io/shiftleft/utils/CpgRunfilesLocator.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package io.shiftleft.utils | ||
|
|
||
| import scala.jdk.OptionConverters.RichOptional | ||
|
|
||
| /** Resolves files via the Bazel runfiles lookup. Only meant for tests inside of this repository. The sbt build always | ||
| * returns None, so callers need to fall back to [[ProjectRoot.relativise]]. | ||
| */ | ||
| private[shiftleft] object CpgRunfilesLocator { | ||
| def resolve(path: String): Option[String] = | ||
| CpgRunfilesLocatorJava.resolve(path).toScala | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please make a followup PR that removes better_files? This seems to be one of the last cases where it is still in our codebase.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure.