From 0f90c082815d717fc94d113823acd007f09a6b7d Mon Sep 17 00:00:00 2001 From: Flu0r1ne Date: Wed, 8 Sep 2021 22:02:00 -0500 Subject: Add traces when segfaults prohibit JSON output from being omitted --- adapters/gtest/executable.go | 9 ++++----- cmd/planr/sub/cli.go | 2 +- version.go | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/adapters/gtest/executable.go b/adapters/gtest/executable.go index bb47d9c..c52a189 100644 --- a/adapters/gtest/executable.go +++ b/adapters/gtest/executable.go @@ -91,7 +91,7 @@ func createExecutables(tcs []planr.TestCase) []executable { } func (exe executable) compile(builddir string) (succeeded bool, buildFailures []planr.TestResult) { - cmd := exec.Command("make", "-C", builddir, exe.exeNm) + cmd := exec.Command("make", "-C", builddir, exe.exeNm + "/fast") out, err := cmd.CombinedOutput() buildFailures = make([]planr.TestResult, 0) @@ -159,10 +159,11 @@ func runGtest(exe string, tc planr.TestCase, builddir string) planr.TestResult { } results, err := decodeResults(f) + result.TestOutput = string(out) if err != nil { - result.Status = planr.COMPILATION_FAILURE - result.DebugOutput += fmt.Sprintf("Could not collect results from %s: %v\n\nDid you mistakenly create a main?\n", exe, err) + result.Status = planr.RUNTIME_FAILURE + result.TestOutput += fmt.Sprintf("Could not collect results from %s: %v\n", exe, err) return result } @@ -182,8 +183,6 @@ func runGtest(exe string, tc planr.TestCase, builddir string) planr.TestResult { decodeResult := results[0] - result.TestOutput = string(out) - if decodeResult.pass { result.Status = planr.PASSING } else { diff --git a/cmd/planr/sub/cli.go b/cmd/planr/sub/cli.go index 4d29144..5defa96 100644 --- a/cmd/planr/sub/cli.go +++ b/cmd/planr/sub/cli.go @@ -91,7 +91,7 @@ func tcPprint(tr planr.TestResult, opt PrintOpts) { if tc.Config.Points != nil && opt.HasFlag(PRINT_POINTS) { points := fmt.Sprintf("%.1f", *tc.Config.Points) - pprintLabeled("points1", points) + pprintLabeled("points", points) } if tc.Config.Description != "" && opt.HasFlag(PRINT_DESCRIPTION) { diff --git a/version.go b/version.go index 54c1d83..6a63ced 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,3 @@ package planr -const VERSION = "0.1.3" +const VERSION = "0.1.4" -- cgit v1.2.3