github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c0f3a59726ecb6842632fee77c6a28858f617270' into coverage

Browse Source
This commit is contained in:
Tom Wilkie
2015-11-10 12:08:03 +00:00
parent 5c717978d9 c0f3a59726
commit 40135dc284
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/runner/runner.go
View File

@@ -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
}

2
tools/test
View File

@@ -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