From a29dcb92db040324d99338884234d063b8075614 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 7 Jul 2017 15:12:27 +1000 Subject: [PATCH] Fix some error messages for "puffs bench". --- cmd/puffs-test-c/main.go | 6 +++++- cmd/puffs/test.go | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmd/puffs-test-c/main.go b/cmd/puffs-test-c/main.go index 238d3b9d..90c2dec9 100644 --- a/cmd/puffs-test-c/main.go +++ b/cmd/puffs-test-c/main.go @@ -38,7 +38,11 @@ func main1() error { failed = failed || f } if failed { - return fmt.Errorf("%s: some tests failed", os.Args[0]) + s := "tests" + if *bench { + s = "benchmarks" + } + return fmt.Errorf("%s: some %s failed", os.Args[0], s) } return nil } diff --git a/cmd/puffs/test.go b/cmd/puffs/test.go index 9c9c5deb..48da386b 100644 --- a/cmd/puffs/test.go +++ b/cmd/puffs/test.go @@ -4,7 +4,6 @@ package main import ( - "errors" "flag" "fmt" "os" @@ -60,7 +59,11 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error { failed = failed || f } if failed { - return errors.New("puffs test: some tests failed") + s0, s1 := "test", "tests" + if bench { + s0, s1 = "bench", "benchmarks" + } + return fmt.Errorf("puffs %s: some %s failed", s0, s1) } return nil }