From f937e3282f3e8487ec1e1287384fcdd14afd6004 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sun, 25 Jul 2021 11:20:19 -0400
Subject: [PATCH] Tests: Ignore DepSet hash numbers. (#3083)

---
 test_regress/driver.pl              |  3 ++-
 test_regress/t/t_xml_debugcheck.out | 10 +++++-----
 test_regress/t/t_xml_debugcheck.pl  |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index bf6efd9bc..9073406bf 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -2185,13 +2185,14 @@ sub files_identical {
                 s/^-V\{t[0-9]+,[0-9]+\}/-V{t#,#}/;  # --vlt vs --vltmt run differences
                 $_;
             } @l1;
-            for (my $l=0; $l<=$#l1; ++$l) {
+            for (my $l = 0; $l <= $#l1; ++$l) {
                 # Don't put control chars into our source repository
                 $l1[$l] =~ s/\r/<#013>/mig;
                 $l1[$l] =~ s/Command Failed[^\n]+/Command Failed/mig;
                 $l1[$l] =~ s/Version: Verilator[^\n]+/Version: Verilator ###/mig;
                 $l1[$l] =~ s/CPU Time: +[0-9.]+ seconds[^\n]+/CPU Time: ###/mig;
                 $l1[$l] =~ s/\?v=[0-9.]+/?v=latest/mig;  # warning URL
+                $l1[$l] =~ s/DepSet_[a-f0-9]+_/DepSet_#_/mg;
                 if ($l1[$l] =~ s/Exiting due to.*/Exiting due to/mig) {
                     splice @l1, $l+1;  # Trunc rest
                     last;
diff --git a/test_regress/t/t_xml_debugcheck.out b/test_regress/t/t_xml_debugcheck.out
index bd15fe808..2a62297bf 100644
--- a/test_regress/t/t_xml_debugcheck.out
+++ b/test_regress/t/t_xml_debugcheck.out
@@ -1501,12 +1501,12 @@
     <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root.h"/>
     <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit.h"/>
     <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_e7f5d2c7__0__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_99496269__0__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_e7f5d2c7__0.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_99496269__0.cpp"/>
+    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_#__0__Slow.cpp"/>
+    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_#__0__Slow.cpp"/>
+    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_#__0.cpp"/>
+    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_#__0.cpp"/>
     <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__DepSet_ba8f1d71__0__Slow.cpp"/>
+    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__DepSet_#__0__Slow.cpp"/>
     <typetable fl="a0" loc="a,0,0,0,0">
       <basicdtype fl="d32" loc="d,32,24,32,27" id="1" name="logic"/>
       <basicdtype fl="d52" loc="d,52,9,52,10" id="6" name="logic" left="31" right="0"/>
diff --git a/test_regress/t/t_xml_debugcheck.pl b/test_regress/t/t_xml_debugcheck.pl
index 4770d909d..392d9a60c 100755
--- a/test_regress/t/t_xml_debugcheck.pl
+++ b/test_regress/t/t_xml_debugcheck.pl
@@ -21,7 +21,7 @@ compile(
     make_main => 0,
     );
 
-files_identical("$out_filename", $Self->{golden_filename});
+files_identical("$out_filename", $Self->{golden_filename}, 'logfile');
 
 # make sure that certain tags are present in --debug-check
 # that would not be present in --xml-only