From 66ad44853444bf1e189a7bc8b07475785a618c36 Mon Sep 17 00:00:00 2001 From: Volodymyr Shymanskyy Date: Thu, 14 Nov 2019 14:48:43 +0200 Subject: [PATCH] Use last reported value as a result --- test/run-spec-test.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/run-spec-test.py b/test/run-spec-test.py index 0617674..c576a8b 100755 --- a/test/run-spec-test.py +++ b/test/run-spec-test.py @@ -204,17 +204,17 @@ def runInvoke(test): actual = "" if not actual: result = re.findall(r'^Result: (.*?)$', "\n" + output + "\n", re.MULTILINE) - if len(result) == 1: - actual = "result " + result[0] + if len(result) > 0: + actual = "result " + result[-1] actual_val = result[0] if not actual: result = re.findall(r'^Error: \[trap\] (.*?) \(', "\n" + output + "\n", re.MULTILINE) - if len(result) == 1: - actual = "trap " + result[0] + if len(result) > 0: + actual = "trap " + result[-1] if not actual: result = re.findall(r'^Error: (.*?)$', "\n" + output + "\n", re.MULTILINE) - if len(result) == 1: - actual = "error " + result[0] + if len(result) > 0: + actual = "error " + result[-1] if not actual: actual = "" @@ -314,13 +314,13 @@ else: #"int_literals", -> stack underflow #--- TODO --- - #"address", "align", "memory", #"get_local", "set_local", "tee_local", + #"if", "loop", "block", "br", "br_if", "br_table", "return", + #"nop", "unreachable", + #"address", "align", "memory", #"float_literals", #"globals", #"func", - #"if", "loop", "block", "br", "br_if", "br_table", "return", - #"nop", "unreachable", #"float_exprs", #"float_memory", #"elem",