Turn on race and msan tags when those modes are enabled (bazel-contrib#1562)

Also: clean up the race tests, move to tests/core, and test that the
race tag is set.

Fixes bazel-contrib#1559

Author: jayconrod

go/private/context.bzl

@@ -224,6 +224,11 @@ def go_context(ctx, attr = None):
 
     context_data = attr._go_context_data
     mode = get_mode(ctx, host_only, toolchain, context_data)
+    tags = list(context_data.tags)
+    if mode.race:
+        tags.append("race")
+    if mode.msan:
+        tags.append("msan")
     binary = _get_go_binary(context_data)
 
     stdlib = getattr(attr, "_stdlib", None)
@@ -268,7 +273,7 @@ def go_context(ctx, attr = None):
         coverage_enabled = ctx.configuration.coverage_enabled,
         coverage_instrumented = ctx.coverage_instrumented(),
         env = env,
-        tags = context_data.tags,
+        tags = tags,
         # Action generators
         archive = toolchain.actions.archive,
         asm = toolchain.actions.asm,

tests/core/README.rst

@@ -9,6 +9,7 @@ Contents
 .. Child list start
 
 * `Basic go_path functionality <go_path/README.rst>`_
+* `Basic -buildmode=plugin functionality <go_plugin/README.rst>`_
 * `Basic go_binary functionality <go_binary/README.rst>`_
 * `Basic go_library functionality <go_library/README.rst>`_
 * `Cross compilation <cross/README.rst>`_
@@ -19,6 +20,7 @@ Contents
 * `Import maps <importmap/README.rst>`_
 * `Basic go_test functionality <go_test/README.rst>`_
 * `Basic cgo functionality <cgo/README.rst>`_
+* `race instrumentation <race/README.rst>`_
 * `go_proto_library importmap <go_proto_library_importmap/README.rst>`_
 
 .. Child list end

tests/legacy/race/BUILD.bazel renamed to tests/core/race/BUILD.bazel

@@ -1,60 +1,57 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test", "go_binary", "go_source")
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_source", "go_test")
 load("@io_bazel_rules_go//tests:bazel_tests.bzl", "bazel_test")
-load(":generate_test.bzl", "generate_script")
 
-go_library(
-    name = "go_default_library",
-    srcs = ["race.go"],
-    importpath = "github.com/bazelbuild/rules_go/tests/race",
-    deps = ["//tests/legacy/race/racy:go_default_library"],
-)
-
-go_binary(
-    name = "race_main",
-    srcs = ["race_main.go"],
-    deps = [":go_default_library"],
+go_test(
+    name = "race_auto_test",
+    size = "small",
+    embed = [":race_test_src"],
 )
 
 go_source(
-    name = "race_test",
+    name = "race_test_src",
     srcs = ["race_test.go"],
     embed = [":go_default_library"],
 )
 
 go_test(
-    name = "race_auto_test",
-    size = "small",
-    embed = [":race_test"],
+    name = "race_on_test",
+    srcs = [
+        "race_off_fail_test.go",
+        "race_on_test.go",
+    ],
+    args = [
+        "$(location :race_on_tester)",
+        "$(location :race_bin)",
+    ],
+    data = [
+        ":race_bin",
+        ":race_on_tester",
+    ],
+    race = "on",
+    rundir = ".",
+    deps = ["//tests/core/race/racy:go_default_library"],
 )
 
 go_test(
     name = "race_on_tester",
-    size = "small",
-    embed = [":race_test"],
+    embed = [":race_test_src"],
     race = "on",
     tags = ["manual"],
 )
 
-generate_script(
-    name = "race_on_test_script",
-    testonly = True,
-    binary = ":race_on_tester",
-)
-
-sh_test(
-    name = "race_on_test",
-    size = "small",
-    srcs = [":race_on_test_script"],
-    data = [":race_on_tester"],
+go_binary(
+    name = "race_bin",
+    srcs = ["race_main.go"],
+    race = "on",
+    deps = [":go_default_library"],
 )
 
 bazel_test(
-    name = "race_feature",
+    name = "race_feature_test",
     args = ["--features=race"],
     check = """
 if [ "$result" -ne 3 ]; then
   echo "error: bazel test failure expected (code 3). Got code $result" >&2
-  cat bazel-output.txt
   exit 1
 else
   result=0
@@ -63,3 +60,10 @@ fi
     command = "test",
     targets = [":race_auto_test"],
 )
+
+go_library(
+    name = "go_default_library",
+    srcs = ["race.go"],
+    importpath = "github.com/bazelbuild/rules_go/tests/core/race",
+    deps = ["//tests/core/race/racy:go_default_library"],
+)

tests/core/race/README.rst

@@ -0,0 +1,25 @@
+race instrumentation
+====================
+
+race_auto_test
+--------------
+
+Triggers a data race inside of a test but does not explicitly enable race mode.
+Should pass if race instrumentation is disabled.
+
+race_on_test
+------------
+
+Checks that race mode is actually enabled in binaries and tests that enable
+it through an attribute by running a binary (``race_bin``) and a test
+(``race_on_tester``) and verifying that they fail.
+
+Also checks that the ``race`` tag is enabled in the test itself and in
+a library.
+
+race_feature_test
+-----------------
+
+Checks that race mode can be enabled with ``--features=race`` by running
+``race_auto_test`` with that flag and verifying that it fails.
+

tests/legacy/race/race.go renamed to tests/core/race/race.go

@@ -1,7 +1,7 @@
 package race
 
 import (
-	"github.com/bazelbuild/rules_go/tests/race/racy"
+	"github.com/bazelbuild/rules_go/tests/core/race/racy"
 )
 
 func TriggerRace() {

tests/legacy/race/race_main.go renamed to tests/core/race/race_main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/bazelbuild/rules_go/tests/race"
+	"github.com/bazelbuild/rules_go/tests/core/race"
 )
 
 func main() {

tests/core/race/race_off_fail_test.go

@@ -0,0 +1,5 @@
+// +build !race
+
+package race
+
+this should not be compiled

tests/core/race/race_on_test.go

@@ -0,0 +1,30 @@
+package race
+
+import (
+	"os"
+	"os/exec"
+	"testing"
+
+	"github.com/bazelbuild/rules_go/tests/core/race/racy"
+)
+
+func TestRaceTest(t *testing.T) {
+	checkRaceBinary(t, os.Args[1])
+}
+
+func TestRaceBin(t *testing.T) {
+	checkRaceBinary(t, os.Args[2])
+}
+
+func TestRaceTag(t *testing.T) {
+	if !racy.RaceEnabled {
+		t.Error("RaceEnabled: got false, want true")
+	}
+}
+
+func checkRaceBinary(t *testing.T, bin string) {
+	err := exec.Command(bin).Run()
+	if _, ok := err.(*exec.ExitError); !ok {
+		t.Errorf("want ExitError; got %v", err)
+	}
+}

tests/legacy/race/race_test.go renamed to tests/core/race/race_test.go

@@ -0,0 +1,12 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "race_off.go",
+        "race_on.go",
+        "racy.go",
+    ],
+    importpath = "github.com/bazelbuild/rules_go/tests/core/race/racy",
+    visibility = ["//visibility:public"],
+)

tests/core/race/racy/BUILD.bazel

@@ -0,0 +1,5 @@
+// +build !race
+
+package racy
+
+const RaceEnabled = false

tests/core/race/racy/race_off.go

@@ -0,0 +1,5 @@
+// +build race
+
+package racy
+
+const RaceEnabled = true