From 2bd3ce6c3fe13299bf9b4f38d204aa4c2dcc5053 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 14 Dec 2022 19:10:39 -0800 Subject: [PATCH] keep .got.svg files for e2ereport.sh after #310 --- ci/e2ereport.sh | 1 + e2etests/e2e_test.go | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/e2ereport.sh b/ci/e2ereport.sh index 691ad8e46..ebf45b912 100755 --- a/ci/e2ereport.sh +++ b/ci/e2ereport.sh @@ -3,6 +3,7 @@ set -eu export REPORT_OUTPUT="out/e2e_report.html" rm -f $REPORT_OUTPUT +export E2E_REPORT=1 FORCE_COLOR=1 DEBUG=1 go run ./e2etests/report/main.go "$@"; diff --git a/e2etests/e2e_test.go b/e2etests/e2e_test.go index bade9f613..f7f70f7ec 100644 --- a/e2etests/e2e_test.go +++ b/e2etests/e2e_test.go @@ -131,7 +131,11 @@ func run(t *testing.T, tc testCase) { assert.Success(t, err) err = ioutil.WriteFile(pathGotSVG, svgBytes, 0600) assert.Success(t, err) - defer os.Remove(pathGotSVG) + // if running from e2ereport.sh, we want to keep .got.svg on a failure + forReport := os.Getenv("E2E_REPORT") != "" + if !forReport { + defer os.Remove(pathGotSVG) + } var xmlParsed interface{} err = xml.Unmarshal(svgBytes, &xmlParsed) @@ -143,6 +147,9 @@ func run(t *testing.T, tc testCase) { err = diff.Testdata(filepath.Join(dataPath, "sketch"), ".svg", svgBytes) assert.Success(t, err) } + if forReport { + os.Remove(pathGotSVG) + } } }