Move legacy reproducibility test to new setup

WORKSPACE

@@ -23,3 +23,19 @@ test_chdir_remote()
 load("@io_bazel_rules_go//tests/integration/popular_repos:popular_repos.bzl", "popular_repos")
 
 popular_repos()
+
+# For manual testing against an LLVM toolchain.
+# Use --crosstool_top=@llvm_toolchain//:toolchain
+http_archive(
+    name = "com_grail_bazel_toolchain",
+    sha256 = "282c67435ebbb612c8a68f3b17f14713e66cbbb863cdd7e206acbd0a2c3f7842",
+    strip_prefix = "bazel-toolchain-a964325290a98766305ec2d8963b1749fe612533",
+    urls = ["https://github.com/grailbio/bazel-toolchain/archive/a964325290a98766305ec2d8963b1749fe612533.tar.gz"],
+)
+
+load("@com_grail_bazel_toolchain//toolchain:configure.bzl", "llvm_toolchain")
+
+llvm_toolchain(
+    name = "llvm_toolchain",
+    llvm_version = "6.0.0",
+)

go/tools/builders/cgo.go

@@ -273,7 +273,7 @@ func fixupLineComments(filename, srcDir string, cFile bool) error {
 	for i, line := range lines {
 		if cFile {
 			if strings.HasPrefix(line, cFileLinePrefix) {
-				lines[i] = strings.Replace(line, srcDir, "", 1)
+				lines[i] = strings.Replace(line, srcDir+string(os.PathSeparator), "", 1)
 			}
 		} else {
 			if strings.HasPrefix(line, goFileTrim) {

go/tools/builders/stdlib.go

@@ -66,7 +66,7 @@ func run(args []string) error {
 	os.Setenv("PATH", strings.Join(absPaths, string(os.PathListSeparator)))
 
 	// Strip path prefix from source files in debug information.
-	os.Setenv("CGO_CFLAGS", os.Getenv("CGO_CFLAGS")+" -fdebug-prefix-map="+abs(".")+"=")
+	os.Setenv("CGO_CFLAGS", os.Getenv("CGO_CFLAGS")+" -fdebug-prefix-map="+abs(".")+string(os.PathSeparator)+"=")
 
 	// Build the commands needed to build the std library in the right mode
 	installArgs := goenv.goCmd("install", "-toolexec", abs(*filterBuildid))

tests/reproducibility/BUILD.bazel

@@ -1,5 +1,14 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
 load("@io_bazel_rules_go//tests:bazel_tests.bzl", "bazel_test", "md5_sum")
 
+go_test(
+    name = "go_default_test",
+    srcs = ["reproducible_binary_test.go"],
+    args = ["$(location //tests/reproducibility/cgo)"],
+    data = ["//tests/reproducibility/cgo"],
+    rundir = ".",  # run in repo root instead of test dir
+)
+
 # A test script that, when run, builds the given targets in a clean build state
 # with sandboxed strategy, and outputs their md5 digests from the build with
 # ___MD5___ prefix to each line.
@@ -35,6 +44,7 @@ print_digests
         "@io_bazel_rules_go//tests/reproducibility/cgo",
     ],
     tags = ["manual"],
+    args = ["--compilation_mode=dbg"],
 )
 
 # A test that runs the above test script twice and diffs the output.
@@ -48,6 +58,5 @@ sh_test(
         "bazel",
         "exclusive",
         "local",
-        "manual",
     ],
 )

tests/legacy/reproducible_binary/reproducible_binary_test.go → tests/reproducibility/reproducible_binary_test.go

@@ -63,6 +63,16 @@ func TestStandardPath(t *testing.T) {
 	}
 }
 
+// TestSandbox checks that the bazel-sandbox path does not appear in strings
+// from the binary.
+func TestSandboxPath(t *testing.T) {
+	for _, s := range allStrings {
+		if bytes.Contains(s, []byte("bazel-sandbox")) {
+			t.Errorf("binary contains bazel sandbox path: %s", s)
+		}
+	}
+}
+
 // TestUserNameAndHome checks the user name and home directory do not
 // appear in strings from the binary.
 func TestUserNameAndHome(t *testing.T) {