changeset e9b095599766 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=e9b095599766
description:
tests: Fix incorrect stat.txt ignore when updating refs
ClassicTest was incorrectly ignoring stats.txt when updating reference
statistics. This was caused by ignore rules being applied too
aggressively when listing reference files. This changeset splits the
ignore rules into two different lists: 1) diff_ignore_files that lists
the files that shouldn't be diff:ed using the normal diff tool, and 2)
ref_ignore_files which lists files that should be ignored by the test
system.
Signed-off-by: Andreas Sandberg <[email protected]>
diffstat:
tests/testing/tests.py | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diffs (36 lines):
diff -r e273e86a873d -r e9b095599766 tests/testing/tests.py
--- a/tests/testing/tests.py Tue May 31 11:07:18 2016 +0100
+++ b/tests/testing/tests.py Tue May 31 11:26:59 2016 +0100
@@ -219,11 +219,19 @@
return self.test_name
class ClassicTest(Test):
- diff_ignore_files = [
- # Stat files use a special stat differ, so don't include them
- # here.
+ # The diff ignore list contains all files that shouldn't be diffed
+ # using DiffOutFile. These files typically use special-purpose
+ # diff tools (e.g., DiffStatFile).
+ diff_ignore_files = (
+ # Stat files use a special stat differ
"stats.txt",
- ]
+ )
+
+ # These files should never be included in the list of
+ # reference files. This list should include temporary files
+ # and other files that we don't care about.
+ ref_ignore_files = (
+ )
def __init__(self, gem5, output_dir, config_tuple,
timeout=None,
@@ -251,7 +259,7 @@
for root, dirs, files in os.walk(ref_dir, topdown=False):
for f in files:
fpath = os.path.join(root[len(ref_dir) + 1:], f)
- if fpath not in ClassicTest.diff_ignore_files:
+ if fpath not in ClassicTest.ref_ignore_files:
yield fpath
def run_units(self):
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
