commit dcc23001ec1ecbcfd9aedcae9fd7d73da5fd0f68
author adonovan <adonovan@google.com> Thu Dec 10 12:09:16 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 10 12:10:53 2020 -0800
tree 5fd16429f5e1261df15b236a527e8dcc0abf6913
parent 37eb1d79ecb019220073b62321f9eb88aebaa4e4

skyframe: improve .bzl loading error messages

Was: "Extension file 'foo.bzl' has errors"
Now: "(compil|initializ)ation of module 'foo.bzl' failed",
 with the location of the failing load statement.
PiperOrigin-RevId: 346836812

src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index be98af2..89dc9fd 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -644,7 +644,7 @@
         .hasMessageThat()
         .isEqualTo(
             "error loading package 'test/starlark': "
-                + "in /workspace/test/starlark/extension.bzl: "
+                + "at /workspace/test/starlark/extension.bzl:1:6: "
                 + "cannot load '//test/starlark:bad_extension.bzl': no such file");
     assertDetailedExitCode(
         errorInfo.getException(), PackageLoading.Code.IMPORT_STARLARK_FILE_ERROR);