From 9d8baa1e44bebb82a5df142c583cb0f7b102a3f8 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Sun, 1 Mar 2026 13:27:46 +0000 Subject: [PATCH] Testing: Relax expected file count in t_flag_csplit_groups (#7163) --- test_regress/driver.py | 2 +- test_regress/t/t_flag_csplit_groups.py | 4 +++- test_regress/t/t_func_dotted_inl2.py | 2 +- test_regress/t/t_func_dotted_inl2_vlt.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test_regress/driver.py b/test_regress/driver.py index dd76f244f..9ccf0ac4d 100755 --- a/test_regress/driver.py +++ b/test_regress/driver.py @@ -2685,7 +2685,7 @@ class VlTest: self.error("File_grep: " + filename + ": Got='" + match.group(1) + "' Expected='" + str(expvalue) + "' in regexp: '" + regexp + "'") return None - return [match.groups()] + return match.groups() def file_grep_count(self, filename: str, regexp, expcount: int) -> None: contents = self.file_contents(filename) diff --git a/test_regress/t/t_flag_csplit_groups.py b/test_regress/t/t_flag_csplit_groups.py index c92448c9e..8210a6dbd 100755 --- a/test_regress/t/t_flag_csplit_groups.py +++ b/test_regress/t/t_flag_csplit_groups.py @@ -125,7 +125,9 @@ test.file_grep_not(test.obj_dir + "/" + test.vm_prefix + "_classes.mk", "vm_clas test.file_grep_not(test.obj_dir + "/" + test.vm_prefix + "_classes.mk", "vm_classes_2") # Check combine count -test.file_grep(test.stats, r'Node count, CFILE + (\d+)', (276 if test.vltmt else 259)) +nFiles = int(test.file_grep(test.stats, r'Node count, CFILE + (\d+)')[0]) +if nFiles < 200: + test.error("Expecting >= 200 files, but got " + str(nFiles)) test.file_grep(test.stats, r'Makefile targets, VM_CLASSES_FAST + (\d+)', 2) test.file_grep(test.stats, r'Makefile targets, VM_CLASSES_SLOW + (\d+)', 2) diff --git a/test_regress/t/t_func_dotted_inl2.py b/test_regress/t/t_func_dotted_inl2.py index 701407a39..958c06200 100755 --- a/test_regress/t/t_func_dotted_inl2.py +++ b/test_regress/t/t_func_dotted_inl2.py @@ -20,7 +20,7 @@ if test.vlt_all: modps = test.file_grep( out_filename, r'{"type":"MODULE","name":"mb","addr":"([^"]*)","loc":"\w,99:[^"]*",.*"origName":"mb"') - modp = modps[0][0] + modp = modps[0] test.file_grep( out_filename, r'{"type":"CELL","name":"t.ma0.mb0","addr":"[^"]*","loc":"\w,87:[^"]*",.*"origName":"mb0",.*"modp":"([^"]*)"', diff --git a/test_regress/t/t_func_dotted_inl2_vlt.py b/test_regress/t/t_func_dotted_inl2_vlt.py index bac3557bc..6b58a6ae3 100755 --- a/test_regress/t/t_func_dotted_inl2_vlt.py +++ b/test_regress/t/t_func_dotted_inl2_vlt.py @@ -19,7 +19,7 @@ if test.vlt_all: modps = test.file_grep( out_filename, r'{"type":"MODULE","name":"mb","addr":"([^"]*)","loc":"\w,99:[^"]*",.*"origName":"mb"') - modp = modps[0][0] + modp = modps[0] test.file_grep( out_filename, r'{"type":"CELL","name":"t.ma0.mb0","addr":"[^"]*","loc":"\w,87:[^"]*",.*"origName":"mb0",.*"modp":"([^"]*)"',