Fix tests with --nolegacy_external_runfiles

bazelbuild · Dec 23, 2023 · e073ab7 · e073ab7
1 parent 460e9c6
commit e073ab7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 25 deletions.
diff --git a/go/tools/bazel_testing/bazel_testing.go b/go/tools/bazel_testing/bazel_testing.go
@@ -482,15 +482,15 @@ func extractTxtar(dir, txt string) error {
 
 func parseLocationArg(arg string) (workspace, shortPath string, err error) {
 	cleanPath := path.Clean(arg)
-	if !strings.HasPrefix(cleanPath, "external/") {
+	if !strings.HasPrefix(cleanPath, "../") {
 		return "", cleanPath, nil
 	}
-	i := strings.IndexByte(arg[len("external/"):], '/')
+	i := strings.IndexByte(arg[len("../"):], '/')
 	if i < 0 {
-		return "", "", fmt.Errorf("unexpected file (missing / after external/): %s", arg)
+		return "", "", fmt.Errorf("unexpected file (missing / after ../): %s", arg)
 	}
-	i += len("external/")
-	workspace = cleanPath[len("external/"):i]
+	i += len("../")
+	workspace = cleanPath[len("../"):i]
 	shortPath = cleanPath[i+1:]
 	return workspace, shortPath, nil
 }

diff --git a/go/tools/builders/stdliblist_test.go b/go/tools/builders/stdliblist_test.go
@@ -15,7 +15,7 @@ func Test_stdliblist(t *testing.T) {
 
 	test_args := []string{
 		fmt.Sprintf("-out=%s", outJSON),
-		"-sdk=external/go_sdk",
+		"-sdk=../go_sdk",
 	}
 
 	if err := stdliblist(test_args); err != nil {
@@ -40,8 +40,9 @@ func Test_stdliblist(t *testing.T) {
 			t.Errorf("export file should be prefixed with __BAZEL_OUTPUT_BASE__ :%v", result)
 		}
 		for _, gofile := range result.GoFiles {
-			if !strings.HasPrefix(gofile, "__BAZEL_OUTPUT_BASE__/external/go_sdk") {
-				t.Errorf("all go files should be prefixed with __BAZEL_OUTPUT_BASE__/external/go_sdk :%v", result)
+			// The SDK runfiles are prefixed with __BAZEL_OUTPUT_BASE__/../go_sdk, which is cleaned.
+			if !strings.HasPrefix(gofile, "go_sdk/") {
+				t.Errorf("all go files should be prefixed with go_sdk/ :%v", result)
 			}
 		}
 	}

diff --git a/tests/core/go_test/BUILD.bazel b/tests/core/go_test/BUILD.bazel
@@ -237,10 +237,10 @@ go_test(
     srcs = ["env_test.go"],
     data = ["@go_sdk//:lib/time/zoneinfo.zip"],
     env = {
-        "ZONEINFO": "$(execpath @go_sdk//:lib/time/zoneinfo.zip)",
+        "ZONEINFO": "$(rlocationpath @go_sdk//:lib/time/zoneinfo.zip)",
     },
     deps = [
-        "@io_bazel_rules_go//go/tools/bazel",
+        "//go/runfiles",
     ],
 )
 

diff --git a/tests/core/go_test/env_test.go b/tests/core/go_test/env_test.go
@@ -15,25 +15,23 @@
 package env_test
 
 import (
+    "github.com/bazelbuild/rules_go/go/runfiles"
     "os"
     "testing"
-
-    "github.com/bazelbuild/rules_go/go/tools/bazel"
 )
 
 func TestEnv(t *testing.T) {
-    v := os.Getenv("ZONEINFO")
-    if v == "" {
-        t.Fatalf("ZONEINFO env var was empty")
-    }
+	v := os.Getenv("ZONEINFO")
+	if v == "" {
+		t.Fatalf("ZONEINFO env var was empty")
+	}
 
-    path, err := bazel.Runfile(v)
-    if err != nil {
-        t.Fatalf("Could not find runfile %v: %v", v, err)
-    }
+	path, err := runfiles.Rlocation(v)
+	if err != nil {
+		t.Fatalf("Could not find runfile %v: %v", v, err)
+	}
 
-    if _, err := os.Stat(path); err != nil {
-        t.Fatalf("Could not find file at env var $ZONEINFO (value: %v) at path %v: %v", v, path, err)
-    }
+	if _, err := os.Stat(path); err != nil {
+		t.Fatalf("Could not find file at env var $ZONEINFO (value: %v) at path %v: %v", v, path, err)
+	}
 }
-
diff --git a/tests/core/runfiles/check_runfiles.go b/tests/core/runfiles/check_runfiles.go
@@ -36,7 +36,7 @@ var DefaultTestFiles = []TestFile{
 	{Workspace: "io_bazel_rules_go", Path: "tests/core/runfiles/local_bin", Binary: true},
 	{Workspace: "runfiles_remote_test", Path: "remote_file.txt"},
 	{Workspace: "runfiles_remote_test", Path: "remote_group.txt"},
-	{Workspace: "runfiles_remote_test", Path: "remote_bin", Binary: true},
+	{Workspace: "runfiles_remote_test", Path: "../runfiles_remote_test/remote_bin", Binary: true},
 }
 
 func CheckRunfiles(files []TestFile) error {