diff options
| author |  lberki <lberki@google.com> | 2017-07-19 09:29:56 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-19 10:22:47 +0200 |
| commit | 48e8b9ff10c8bf7408e63be43decaa71cef188eb (patch) | |
| tree | b831daededc84fd256810942873f70cfddb74bf9 /src/test/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 982c751cdad286553833e238e3a0d912076cb84f (diff) | |
Fix a bunch of test cases that break if genfiles == bin.
A few are left, but they will require actual code changes (as opposed to changes to test cases only)
RELNOTES: None.
PiperOrigin-RevId: 162453092
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index bd82cf1420..e7b7671c31 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -821,7 +821,7 @@ public class CcCommonTest extends BuildViewTestCase { CppLinkAction action = (CppLinkAction) getGeneratingAction(getOnlyElement(getFilesToBuild(target))); assertThat(action.getLinkCommandLine().getLinkopts()).containsExactly( - String.format("-Wl,@%s/genfiles/a/a.lds", getTargetConfiguration().getOutputDirectory( + String.format("-Wl,@%s/a/a.lds", getTargetConfiguration().getGenfilesDirectory( RepositoryName.MAIN).getExecPath().getPathString())); } |