From 5f8060195c23e93a4db2efe55d0408944a104365 Mon Sep 17 00:00:00 2001 From: Morgan Bazalgette Date: Mon, 27 May 2024 14:27:09 +0200 Subject: [PATCH 1/2] test(gnovm): print unexpected error in filetests --- gnovm/tests/file.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnovm/tests/file.go b/gnovm/tests/file.go index 328d9e09299..b6a951a424b 100644 --- a/gnovm/tests/file.go +++ b/gnovm/tests/file.go @@ -136,13 +136,14 @@ func RunFileTest(rootDir string, path string, opts ...RunFileTestOption) error { defer func() { if r := recover(); r != nil { // print output. - fmt.Println("OUTPUT:\n", stdout.String()) - // print stack if unexpected error. + fmt.Printf("OUTPUT:\n%s\n", stdout.String()) pnc = r + err := strings.TrimSpace(fmt.Sprintf("%v", pnc)) + fmt.Printf("ERROR:\n%s\n", err) + // print stack if unexpected error. if errWanted == "" { rtdb.PrintStack() } - err := strings.TrimSpace(fmt.Sprintf("%v", pnc)) if !strings.Contains(err, errWanted) { // error didn't match: print stack // NOTE: will fail testcase later. From 15b44eb91be4c367f53f225c59ee4a3ec50800ff Mon Sep 17 00:00:00 2001 From: Morgan Bazalgette Date: Mon, 27 May 2024 14:36:11 +0200 Subject: [PATCH 2/2] fixup --- gnovm/tests/file.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnovm/tests/file.go b/gnovm/tests/file.go index b6a951a424b..3394937f9c7 100644 --- a/gnovm/tests/file.go +++ b/gnovm/tests/file.go @@ -139,12 +139,10 @@ func RunFileTest(rootDir string, path string, opts ...RunFileTestOption) error { fmt.Printf("OUTPUT:\n%s\n", stdout.String()) pnc = r err := strings.TrimSpace(fmt.Sprintf("%v", pnc)) - fmt.Printf("ERROR:\n%s\n", err) // print stack if unexpected error. - if errWanted == "" { - rtdb.PrintStack() - } - if !strings.Contains(err, errWanted) { + if errWanted == "" || + !strings.Contains(err, errWanted) { + fmt.Printf("ERROR:\n%s\n", err) // error didn't match: print stack // NOTE: will fail testcase later. rtdb.PrintStack()