diff options
| author |  Pedro Liberal Fernandez <plf@google.com> | 2017-01-11 16:10:09 +0000 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-01-12 09:09:26 +0000 |
| commit | db7a9ea7f6b2af3c4c1f43ad4aa50cd4eca02921 (patch) | |
| tree | d1bd3dc5d4fa8ae27ebc0056a06acff19a367c5a /src/test | |
| parent | 21e6996aa6a11aaf797087ed5dfb7bcf8ea39e4a (diff) | |
Rollback of commit 1da8ac3a8bb0780251976e0dbcfebd3a7ba6a066.
--
PiperOrigin-RevId: 144207746
MOS_MIGRATED_REVID=144207746
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java | 14 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java | 15 |
2 files changed, 1 insertions, 28 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java index cad537519e..b24bd9fc30 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java @@ -199,18 +199,6 @@ public abstract class MockCcSupport { + " name: 'thin_lto'" + " requires { feature: 'nonhost' }" + " flag_set {" - + " expand_if_all_available: 'thinlto_params_file'" - + " action: 'c++-link-executable'" - + " action: 'c++-link-dynamic-library'" - + " action: 'c++-link-static-library'" - + " action: 'c++-link-alwayslink-static-library'" - + " action: 'c++-link-pic-static-library'" - + " action: 'c++-link-alwayslink-pic-static-library'" - + " flag_group {" - + " flag: 'thinlto_params_file=%{thinlto_params_file}'" - + " }" - + " }" - + " flag_set {" + " action: 'c-compile'" + " action: 'c++-compile'" + " flag_group {" @@ -220,7 +208,7 @@ public abstract class MockCcSupport { + " flag_set {" + " action: 'lto-indexing'" + " flag_group {" - + " flag: 'params_file=%{thinlto_params_file}'" + + " flag: 'params_file=%{thinlto_optional_params_file}'" + " flag: 'prefix_replace=%{thinlto_prefix_replace}'" + " }" + " }" diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java index 663c51c9d4..633ae48b5c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java @@ -159,21 +159,6 @@ public class LinkBuildVariablesTest extends BuildViewTestCase { } @Test - public void testLinkerParamFileIsExported() throws Exception { - AnalysisMock.get().ccSupport().setupCrosstool(mockToolsConfig); - useConfiguration(); - - scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['some-dir/bar.so'])"); - scratch.file("x/some-dir/bar.so"); - - ConfiguredTarget target = getConfiguredTarget("//x:bin"); - Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); - List<String> variableValue = - getVariableValue(variables, CppLinkActionBuilder.LINKER_PARAM_FILE_VARIABLE); - assertThat(Iterables.getOnlyElement(variableValue)).matches(".*bin/x/bin-2.params$"); - } - - @Test public void testInterfaceLibraryBuildingVariablesWhenGenerationPossible() throws Exception { // Make sure the interface shared object generation is enabled in the configuration // (which it is not by default for some windows toolchains) |