From e734c7645b6b287a1ae749d049768176dfea06a0 Mon Sep 17 00:00:00 2001 From: bolyor <464861137@qq.com> Date: Mon, 13 Jul 2020 20:46:53 +0800 Subject: [PATCH] [test]update scan-auto for EXPECTED --- test/maple_test/compare.py | 7 +++++-- test/maple_test/task.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/maple_test/compare.py b/test/maple_test/compare.py index dd2eeb1de5..3ac77e7580 100644 --- a/test/maple_test/compare.py +++ b/test/maple_test/compare.py @@ -31,7 +31,7 @@ EXPECTED_REGEX = r"\:{line_num}\:.*\:.*" SCAN_KEYWORDS = ["auto", "not", "next", "end"] CMP_KEYWORDS = ["end", "not", "next", "full"] -EXPECTED_KEYWORDS = ["scan", "scan-not"] +EXPECTED_KEYWORDS = ["scan", "scan-not", "scan-auto"] class CompareError(Exception): @@ -74,9 +74,13 @@ def main(): pattern_flag, pattern = split_pattern_line(compare_pattern) info = "" + keywords = pattern_flag.split("-") if flag.strip() in assert_flags: info = "It's a assert, " elif flag.strip() in expected_flags: + if "auto" in keywords: + pattern = r"\s+".join([re.escape(word) for word in pattern.split()]) + keywords.remove("auto") pattern = EXPECTED_REGEX.format(line_num=line_num) + pattern if pattern_flag.strip() not in EXPECTED_KEYWORDS: raise CompareError( @@ -85,7 +89,6 @@ def main(): else: raise CompareError("Unsupport flag: {!r}".format(flag)) - keywords = pattern_flag.split("-") match_func = gen_match_func(keywords) if "next" not in keywords and "end" not in keywords: start = 0 diff --git a/test/maple_test/task.py b/test/maple_test/task.py index 8cef13ba65..b321b1e61a 100644 --- a/test/maple_test/task.py +++ b/test/maple_test/task.py @@ -207,7 +207,7 @@ class TestSuiteTask: case_files.update(_cases) else: logger.info( - "Testlist: {}, ALL-TEST-CASE: {} is contain not test case".format( + "Testlist: {}, ALL-TEST-CASE: {} is invalid test case".format( testlist_path, pattern ) ) @@ -217,7 +217,7 @@ class TestSuiteTask: case_files -= _cases else: logger.info( - "Testlist: {}, EXCLUDE-TEST-CASE: {} is contain not test case".format( + "Testlist: {}, EXCLUDE-TEST-CASE: {} is invalid test case".format( testlist_path, pattern ) ) -- Gitee