diff options
author | mjhalupka <mjhalupka@google.com> | 2018-03-22 13:37:38 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-22 13:38:49 -0700 |
commit | 5d7fa7ba5d93a1fe35353b05882698b0d74d90f7 (patch) | |
tree | 3dc1c360c768c18ccdcdbc5607d98216a2a4f77b /src/test/java/com/google/devtools/build/lib/BUILD | |
parent | 62af2b4763510033cf824a4c6d1e59e566002361 (diff) |
Add a DefaultBuildOptions specifying default build flags that may differ from the provided defaults in Options classes. These are used to create BuildOptionsDiffForReconstruction, which lets us store only the diffs in our BuildConfigurationValue.Keys.
PiperOrigin-RevId: 190117455
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/BUILD')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 205bf8f020..1e80aee5df 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -558,12 +558,15 @@ java_test( java_library( name = "analysis_testutil", testonly = 1, - srcs = glob([ - "analysis/LicensingTests.java", - "analysis/mock/BazelAnalysisMock.java", - "analysis/util/*.java", - "exec/util/*.java", - ]), + srcs = glob( + [ + "analysis/LicensingTests.java", + "analysis/mock/BazelAnalysisMock.java", + "analysis/util/*.java", + "exec/util/*.java", + ], + exclude = ["analysis/util/DefaultBuildOptionsForTesting.java"], + ), resources = [ "analysis/mock/MOCK_CROSSTOOL", ], @@ -573,6 +576,7 @@ java_library( ], deps = [ ":actions_testutil", + ":default_test_build_rules", ":foundations_testutil", ":guava_junit_truth", ":packages_testutil", @@ -625,6 +629,16 @@ java_library( ) java_library( + name = "default_test_build_rules", + testonly = 1, + srcs = ["analysis/util/DefaultBuildOptionsForTesting.java"], + deps = [ + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/common/options", + ], +) + +java_library( name = "integration_testutil", testonly = 1, srcs = glob([ @@ -821,6 +835,7 @@ java_library( "packages/util/MOCK_OSX_CROSSTOOL", ], deps = [ + ":default_test_build_rules", ":foundations_testutil", ":guava_junit_truth", ":testutil", @@ -901,6 +916,7 @@ java_test( test_class = "com.google.devtools.build.lib.AllTests", deps = [ ":analysis_testutil", + ":default_test_build_rules", ":guava_junit_truth", ":packages_testutil", ":test_runner", |