diff options
author | Greg Estren <gregce@google.com> | 2016-05-03 16:01:13 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-05-03 21:32:10 +0000 |
commit | d50f7b81b6ac292791715d302fa6cc9326d68475 (patch) | |
tree | 19af61828b0d78ad404a1e75eb8fa77e7e0f732b /src/test/java/com/google/devtools | |
parent | 5666be187ccafa49913dce6ab31b73cbd5b6d9c9 (diff) |
Port tests using abi_deps to select.
"abi" / "abi_deps" are being removed imminently.
--
MOS_MIGRATED_REVID=121380507
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java index 25748c0a2b..46b516466e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java @@ -136,8 +136,19 @@ public abstract class BuildViewTestBase extends AnalysisTestCase { reporter.removeHandler(failFastHandler); useConfiguration("--experimental_multi_cpu=" + badCpu + "," + goodCpu); scratch.file("multi/BUILD", - "cc_library(name='cpu', abi='$(TARGET_CPU)', abi_deps={'" + badCpu + "':[':fail']})", - "genrule(name='fail', outs=['file1', 'file2'], executable = 1, cmd='touch $@')"); + "config_setting(", + " name = 'config',", + " values = {'cpu': '" + badCpu + "'})", + "cc_library(", + " name = 'cpu',", + " deps = select({", + " ':config': [':fail'],", + " '//conditions:default': []}))", + "genrule(", + " name = 'fail',", + " outs = ['file1', 'file2'],", + " executable = 1,", + " cmd = 'touch $@')"); update(defaultFlags().with(Flag.KEEP_GOING), "//multi:cpu"); AnalysisResult result = getAnalysisResult(); assertThat(result.getTargetsToBuild()).hasSize(1); |