From c0f3a59726ecb6842632fee77c6a28858f617270 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 10 Nov 2015 12:08:03 +0000 Subject: [PATCH] Squashed 'tools/' changes from 28c6aa0..1fc4d66 1fc4d66 Make test work on mac. REVERT: 28c6aa0 Make prefix on runner schedule optional. git-subtree-dir: tools git-subtree-split: 1fc4d66fac376fc85b98b3e16c31c46661d6db32 --- runner/runner.go | 7 +------ test | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/runner/runner.go b/runner/runner.go index f09ffcd6d..bfac9c58b 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -138,16 +138,11 @@ func updateScheduler(test string, duration float64) { func getSchedule(tests []string) ([]string, error) { var ( - prefix = os.Getenv("SCHEDULER_PREFIX") - buildNum = os.Getenv("CIRCLE_BUILD_NUM") + testRun = "integration-" + os.Getenv("CIRCLE_BUILD_NUM") shardCount = os.Getenv("CIRCLE_NODE_TOTAL") shardID = os.Getenv("CIRCLE_NODE_INDEX") requestBody = &bytes.Buffer{} - testRun = "integration-" + buildNum ) - if prefix != "" { - testRun = prefix + "-" + buildNum - } if err := json.NewEncoder(requestBody).Encode(schedule{tests}); err != nil { return []string{}, err } diff --git a/test b/test index 7037ee789..9250f6280 100755 --- a/test +++ b/test @@ -63,7 +63,7 @@ for dir in $TESTDIRS; do GO_TEST_ARGS_RUN="$GO_TEST_ARGS" if [ -n "$SLOW" ]; then - COVERPKGS=$( (go list $dir; go list -f '{{join .Deps "\n"}}' $dir | grep -v "vendor" | grep "^$PACKAGE_BASE/") | paste -s -d,) + COVERPKGS=$( (go list $dir; go list -f '{{join .Deps "\n"}}' $dir | grep -v "vendor" | grep "^$PACKAGE_BASE/") | paste -s -d, -) output=$(mktemp $coverdir/unit.XXXXXXXXXX) GO_TEST_ARGS_RUN="$GO_TEST_ARGS -coverprofile=$output -coverpkg=$COVERPKGS" fi