From c2b82c293ffc226f6364b5e7d96774f54c54945f Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 13 Sep 2024 18:31:35 -0400 Subject: [PATCH] Tests: Fix driver creating .out with --gold --- test_regress/driver.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test_regress/driver.py b/test_regress/driver.py index c0bda8841..ce6ed1742 100755 --- a/test_regress/driver.py +++ b/test_regress/driver.py @@ -2180,9 +2180,9 @@ class VlTest: fn2, 'r', encoding='latin-1', newline='\n') except FileNotFoundError: f2 = None - if 'HARNESS_UPDATE_GOLDEN' not in os.environ: - if not moretry: - self.error("Files_identical file does not exist: " + fn2) + if not moretry: + self.copy_if_golden(fn1, fn2) + self.error("Files_identical file does not exist: " + fn2) return True ok = self._files_identical_reader(f1, f2, @@ -2204,12 +2204,13 @@ class VlTest: if is_logfile: l1o = [] for line in l1s: - if (re.match(r'^- [^\n]+\n', line) or re.match(r'^- [a-z.0-9]+:\d+:[^\n]+\n', line) - or re.match(r'^-node:', line) or re.match(r'^dot [^\n]+\n', line) - or re.match(r'^Aborted \(core dumped\)', line) - or re.match(r'^dot [^\n]+\n', line) - or re.match(r'^In file: .*\/sc_.*:\d+', line) - or re.match(r'^libgcov.*', line) + if (re.match(r'^- [^\n]+\n', line) # + or re.match(r'^- [a-z.0-9]+:\d+:[^\n]+\n', line) + or re.match(r'^-node:', line) # + or re.match(r'^dot [^\n]+\n', line) # + or re.match(r'^Aborted', line) # + or re.match(r'^In file: .*\/sc_.*:\d+', line) # + or re.match(r'^libgcov.*', line) # or re.match(r'--- \/tmp\/', line) # t_difftree.py or re.match(r'\+\+\+ \/tmp\/', line) # t_difftree.py or re.match(r'^==[0-9]+== ?[^\n]*\n', line)): # valgrind