[FAB-12099] build plugins with race when needed

This allows us to run tests with and without the race detector.

Change-Id: If20a850c6e9d5484bf9f4b39415e0cabe8410d1c
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

bccsp/factory/pluginfactory_test.go

@@ -1,4 +1,4 @@
-// +build linux,go1.9,cgo
+// +build go1.9,linux,cgo go1.10,darwin,cgo
 // +build !ppc64le
 
 /*
@@ -16,12 +16,20 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+// raceEnabled is set to true when the race build tag is enabled.
+// see race_test.go
+var raceEnabled bool
+
 func buildPlugin(lib string, t *testing.T) {
 	t.Helper()
 	// check to see if the example plugin exists
 	if _, err := os.Stat(lib); err != nil {
 		// build the example plugin
-		cmd := exec.Command("go", "build", "-buildmode=plugin", "github.com/hyperledger/fabric/examples/plugins/bccsp")
+		cmd := exec.Command("go", "build", "-buildmode=plugin")
+		if raceEnabled {
+			cmd.Args = append(cmd.Args, "-race")
+		}
+		cmd.Args = append(cmd.Args, "github.com/hyperledger/fabric/examples/plugins/bccsp")
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("Could not build plugin: [%s]", err)

bccsp/factory/race_test.go

@@ -0,0 +1,14 @@
+// +build race
+// +build go1.9,linux,cgo go1.10,darwin,cgo
+// +build !ppc64le
+
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package factory
+
+func init() {
+	raceEnabled = true
+}

core/handlers/library/race_test.go

@@ -0,0 +1,14 @@
+// +build race
+// +build go1.9,linux,cgo go1.10,darwin,cgo
+// +build !ppc64le
+
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package library
+
+func init() {
+	raceEnabled = true
+}

core/handlers/library/registry_plugin_test.go

@@ -1,4 +1,4 @@
-// +build go1.9,linux,cgo
+// +build go1.9,linux,cgo go1.10,darwin,cgo
 // +build !ppc64le
 
 /*
@@ -14,7 +14,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"strings"
+	"path/filepath"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
@@ -31,18 +31,29 @@ const (
 	validationTestPlugin   = "github.com/hyperledger/fabric/core/handlers/validation/testdata/"
 )
 
+// raceEnabled is set to true when the race build tag is enabled.
+// see race_test.go
+var raceEnabled bool
+
+func buildPlugin(t *testing.T, dest, pkg string) {
+	cmd := exec.Command("go", "build", "-o", dest, "-buildmode=plugin")
+	if raceEnabled {
+		cmd.Args = append(cmd.Args, "-race")
+	}
+	cmd.Args = append(cmd.Args, pkg)
+	output, err := cmd.CombinedOutput()
+	assert.NoError(t, err, "Could not build plugin: "+string(output))
+}
+
 func TestLoadAuthPlugin(t *testing.T) {
 	endorser := &mockEndorserServer{}
 
 	testDir, err := ioutil.TempDir("", "")
 	assert.NoError(t, err, "Could not create temp directory for plugins")
 	defer os.Remove(testDir)
-	pluginPath := strings.Join([]string{testDir, "/", "authplugin.so"}, "")
 
-	cmd := exec.Command("go", "build", "-o", pluginPath, "-buildmode=plugin",
-		authPluginPackage)
-	output, err := cmd.CombinedOutput()
-	assert.NoError(t, err, "Could not build plugin: "+string(output))
+	pluginPath := filepath.Join(testDir, "authplugin.so")
+	buildPlugin(t, pluginPath, authPluginPackage)
 
 	testReg := registry{}
 	testReg.loadPlugin(pluginPath, Auth)
@@ -60,12 +71,9 @@ func TestLoadDecoratorPlugin(t *testing.T) {
 	testDir, err := ioutil.TempDir("", "")
 	assert.NoError(t, err, "Could not create temp directory for plugins")
 	defer os.Remove(testDir)
-	pluginPath := strings.Join([]string{testDir, "/", "decoratorplugin.so"}, "")
 
-	cmd := exec.Command("go", "build", "-o", pluginPath, "-buildmode=plugin",
-		decoratorPluginPackage)
-	output, err := cmd.CombinedOutput()
-	assert.NoError(t, err, "Could not build plugin: "+string(output))
+	pluginPath := filepath.Join(testDir, "decoratorplugin.so")
+	buildPlugin(t, pluginPath, decoratorPluginPackage)
 
 	testReg := registry{}
 	testReg.loadPlugin(pluginPath, Decoration)
@@ -80,12 +88,8 @@ func TestEndorsementPlugin(t *testing.T) {
 	assert.NoError(t, err, "Could not create temp directory for plugins")
 	defer os.Remove(testDir)
 
-	pluginPath := strings.Join([]string{testDir, "/", "endorsementplugin.so"}, "")
-
-	cmd := exec.Command("go", "build", "-o", pluginPath, "-buildmode=plugin",
-		endorsementTestPlugin)
-	output, err := cmd.CombinedOutput()
-	assert.NoError(t, err, "Could not build plugin: "+string(output))
+	pluginPath := filepath.Join(testDir, "endorsementplugin.so")
+	buildPlugin(t, pluginPath, endorsementTestPlugin)
 
 	testReg := registry{endorsers: make(map[string]endorsement.PluginFactory)}
 	testReg.loadPlugin(pluginPath, Endorsement, "escc")
@@ -95,7 +99,7 @@ func TestEndorsementPlugin(t *testing.T) {
 	instance := factory.New()
 	assert.NotNil(t, instance)
 	assert.NoError(t, instance.Init())
-	_, output, err = instance.Endorse([]byte{1, 2, 3}, nil)
+	_, output, err := instance.Endorse([]byte{1, 2, 3}, nil)
 	assert.NoError(t, err)
 	assert.Equal(t, []byte{1, 2, 3}, output)
 }
@@ -105,12 +109,8 @@ func TestValidationPlugin(t *testing.T) {
 	assert.NoError(t, err, "Could not create temp directory for plugins")
 	defer os.Remove(testDir)
 
-	pluginPath := strings.Join([]string{testDir, "/", "validationplugin.so"}, "")
-
-	cmd := exec.Command("go", "build", "-o", pluginPath, "-buildmode=plugin",
-		validationTestPlugin)
-	output, err := cmd.CombinedOutput()
-	assert.NoError(t, err, "Could not build plugin: "+string(output))
+	pluginPath := filepath.Join(testDir, "validationplugin.so")
+	buildPlugin(t, pluginPath, validationTestPlugin)
 
 	testReg := registry{validators: make(map[string]validation.PluginFactory)}
 	testReg.loadPlugin(pluginPath, Validation, "vscc")