solving conflict

benchmark/worker/benchmark_client.go

@@ -33,10 +33,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
-)
-
-var (
-	caFile = "benchmark/server/testdata/ca.pem"
+	"google.golang.org/grpc/testdata"
 )
 
 type lockingHistogram struct {
@@ -122,7 +119,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
 
 	// Check and set security options.
 	if config.SecurityParams != nil {
-		creds, err := credentials.NewClientTLSFromFile(abs(caFile), config.SecurityParams.ServerHostOverride)
+		creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), config.SecurityParams.ServerHostOverride)
 		if err != nil {
 			return nil, nil, grpc.Errorf(codes.InvalidArgument, "failed to create TLS credentials %v", err)
 		}

benchmark/worker/benchmark_server.go

@@ -32,12 +32,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
-)
-
-var (
-	// File path related to google.golang.org/grpc.
-	certFile = "benchmark/server/testdata/server1.pem"
-	keyFile  = "benchmark/server/testdata/server1.key"
+	"google.golang.org/grpc/testdata"
 )
 
 type benchmarkServer struct {
@@ -90,7 +85,7 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
 
 	// Set security options.
 	if config.SecurityParams != nil {
-		creds, err := credentials.NewServerTLSFromFile(abs(certFile), abs(keyFile))
+		creds, err := credentials.NewServerTLSFromFile(testdata.Path("server1.pem"), testdata.Path("server1.key"))
 		if err != nil {
 			grpclog.Fatalf("failed to generate credentials %v", err)
 		}

benchmark/worker/util.go

@@ -18,26 +18,7 @@
 
 package main
 
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"syscall"
-)
-
-// abs returns the absolute path the given relative file or directory path,
-// relative to the google.golang.org/grpc directory in the user's GOPATH.
-// If rel is already absolute, it is returned unmodified.
-func abs(rel string) string {
-	if filepath.IsAbs(rel) {
-		return rel
-	}
-	v, err := goPackagePath("google.golang.org/grpc")
-	if err != nil {
-		log.Fatalf("Error finding google.golang.org/grpc/testdata directory: %v", err)
-	}
-	return filepath.Join(v, rel)
-}
+import "syscall"
 
 func cpuTimeDiff(first *syscall.Rusage, latest *syscall.Rusage) (float64, float64) {
 	var (
@@ -52,25 +33,3 @@ func cpuTimeDiff(first *syscall.Rusage, latest *syscall.Rusage) (float64, float6
 
 	return uTimeElapsed, sTimeElapsed
 }
-
-func goPackagePath(pkg string) (path string, err error) {
-	gp := os.Getenv("GOPATH")
-	if gp == "" {
-		return path, os.ErrNotExist
-	}
-	for _, p := range filepath.SplitList(gp) {
-		dir := filepath.Join(p, "src", filepath.FromSlash(pkg))
-		fi, err := os.Stat(dir)
-		if os.IsNotExist(err) {
-			continue
-		}
-		if err != nil {
-			return "", err
-		}
-		if !fi.IsDir() {
-			continue
-		}
-		return dir, nil
-	}
-	return path, os.ErrNotExist
-}