diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/docgen/templates/be/predefined-python-variables.vm | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/templates/be/predefined-python-variables.vm b/src/main/java/com/google/devtools/build/docgen/templates/be/predefined-python-variables.vm index bc285fec50..2c6d8c4cb7 100644 --- a/src/main/java/com/google/devtools/build/docgen/templates/be/predefined-python-variables.vm +++ b/src/main/java/com/google/devtools/build/docgen/templates/be/predefined-python-variables.vm @@ -24,3 +24,6 @@ title: Predefined Python Variables of the package being evaluated. The value is unaffected by subinclude. </p> +#if (!$singlePage) +#parse("com/google/devtools/build/docgen/templates/be/footer.vm") +#end diff --git a/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java b/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java index dbab9976cd..aef5f82c27 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java @@ -127,7 +127,7 @@ public class BuildFileASTTest extends EvaluationTestCase { public void testWithSyntaxErrorsDoesNotPrintDollarError() throws Exception { setFailFast(false); BuildFileAST buildFile = parseBuildFile( - "abi = cxx_abi + '-glibc-' + glibc_version + '-' + $(TARGET_CPU) + '-linux'", + "abi = '$(ABI)-glibc-' + glibc_version + '-' + $(TARGET_CPU) + '-linux'", "libs = [abi + opt_level + '/lib/libcc.a']", "shlibs = [abi + opt_level + '/lib/libcc.so']", "+* shlibs", // syntax error at '+' |