# HG changeset patch
# User Nathan Binkert <[EMAIL PROTECTED]>
# Date 1213638368 25200
# Node ID 148a05f7dfb91fc2084bdb9abc913070806c727b
# Parent d98970506a49bae1b7d9186a3f479a272cfb3485
Fix tests script to deal with changes in default file names
diff --git a/tests/SConscript b/tests/SConscript
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -58,7 +58,7 @@ def check_test(target, source, env):
if os.path.exists(t.abspath):
Execute(Delete(t.abspath))
# Run diff on output & ref directories to find differences.
- # Exclude m5stats.txt since we will use diff-out on that.
+ # Exclude the stats file since we will use diff-out on that.
Execute(env.subst('diff -ubr ${SOURCES[0].dir} ${SOURCES[1].dir} ' +
'-I "^command line:" ' + # for stdout file
'-I "^M5 compiled " ' + # for stderr file
@@ -67,12 +67,12 @@ def check_test(target, source, env):
'-I "^Simulation complete at" ' + # for stderr
file
'-I "^Listening for" ' + # for stderr file
'-I "listening for remote gdb" ' + # for stderr file
- '--exclude=m5stats.txt --exclude=SCCS ' +
+ '--exclude=stats --exclude=SCCS ' +
'--exclude=${TARGETS[0].file} ' +
'> ${TARGETS[0]}', target=target, source=source), None)
print "===== Output differences ====="
print contents(target[0])
- # Run diff-out on m5stats.txt file
+ # Run diff-out on stats file
status = Execute(env.subst('$DIFFOUT $SOURCES > ${TARGETS[1]}',
target=target, source=source),
strfunction=None)
@@ -111,14 +111,14 @@ Note: The following file(s) will not be
inputs and are ignored.
'''
# - reference files always needed
-needed_files = set(['stdout', 'stderr', 'm5stats.txt', 'config.ini'])
+needed_files = set(['stdout', 'stderr', 'stats', 'config'])
# - source files we always want to ignore
known_ignores = set(['status', 'outdiff', 'statsdiff'])
def update_test(target, source, env):
"""Update reference test outputs.
- Target is phony. First two sources are the ref & new m5stats.txt
+ Target is phony. First two sources are the ref & new stats file
files, respectively. We actually copy everything in the
respective directories except the status & diff output files.
@@ -170,8 +170,8 @@ def test_builder(env, ref_dir):
def tgt(f):
return os.path.join(tgt_dir, f)
- ref_stats = os.path.join(ref_dir, 'm5stats.txt')
- new_stats = tgt('m5stats.txt')
+ ref_stats = os.path.join(ref_dir, 'stats')
+ new_stats = tgt('stats')
status_file = tgt('status')
# Base command for running test. We mess around with indirectly
diff --git a/tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.ini
b/tests/long/00.gzip/ref/alpha/tru64/o3-timing/config
rename from tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.ini
rename to tests/long/00.gzip/ref/alpha/tru64/o3-timing/config
diff --git a/tests/long/00.gzip/ref/alpha/tru64/o3-timing/m5stats.txt
b/tests/long/00.gzip/ref/alpha/tru64/o3-timing/stats
rename from tests/long/00.gzip/ref/alpha/tru64/o3-timing/m5stats.txt
rename to tests/long/00.gzip/ref/alpha/tru64/o3-timing/stats
diff --git a/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config.ini
b/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config
rename from tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/stats
rename from tests/long/00.gzip/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/long/00.gzip/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/long/00.gzip/ref/alpha/tru64/simple-timing/config.ini
b/tests/long/00.gzip/ref/alpha/tru64/simple-timing/config
rename from tests/long/00.gzip/ref/alpha/tru64/simple-timing/config.ini
rename to tests/long/00.gzip/ref/alpha/tru64/simple-timing/config
diff --git a/tests/long/00.gzip/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/long/00.gzip/ref/alpha/tru64/simple-timing/stats
rename from tests/long/00.gzip/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/long/00.gzip/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini
b/tests/long/00.gzip/ref/sparc/linux/o3-timing/config
rename from tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini
rename to tests/long/00.gzip/ref/sparc/linux/o3-timing/config
diff --git a/tests/long/00.gzip/ref/sparc/linux/o3-timing/m5stats.txt
b/tests/long/00.gzip/ref/sparc/linux/o3-timing/stats
rename from tests/long/00.gzip/ref/sparc/linux/o3-timing/m5stats.txt
rename to tests/long/00.gzip/ref/sparc/linux/o3-timing/stats
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.ini
b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config
rename from tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.ini
rename to tests/long/00.gzip/ref/sparc/linux/simple-atomic/config
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/m5stats.txt
b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats
rename from tests/long/00.gzip/ref/sparc/linux/simple-atomic/m5stats.txt
rename to tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.ini
b/tests/long/00.gzip/ref/sparc/linux/simple-timing/config
rename from tests/long/00.gzip/ref/sparc/linux/simple-timing/config.ini
rename to tests/long/00.gzip/ref/sparc/linux/simple-timing/config
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-timing/m5stats.txt
b/tests/long/00.gzip/ref/sparc/linux/simple-timing/stats
rename from tests/long/00.gzip/ref/sparc/linux/simple-timing/m5stats.txt
rename to tests/long/00.gzip/ref/sparc/linux/simple-timing/stats
diff --git a/tests/long/00.gzip/ref/x86/linux/simple-atomic/config.ini
b/tests/long/00.gzip/ref/x86/linux/simple-atomic/config
rename from tests/long/00.gzip/ref/x86/linux/simple-atomic/config.ini
rename to tests/long/00.gzip/ref/x86/linux/simple-atomic/config
diff --git a/tests/long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt
b/tests/long/00.gzip/ref/x86/linux/simple-atomic/stats
rename from tests/long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt
rename to tests/long/00.gzip/ref/x86/linux/simple-atomic/stats
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.ini
b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config
rename from tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.ini
rename to tests/long/10.mcf/ref/sparc/linux/simple-atomic/config
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/m5stats.txt
b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats
rename from tests/long/10.mcf/ref/sparc/linux/simple-atomic/m5stats.txt
rename to tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.ini
b/tests/long/10.mcf/ref/sparc/linux/simple-timing/config
rename from tests/long/10.mcf/ref/sparc/linux/simple-timing/config.ini
rename to tests/long/10.mcf/ref/sparc/linux/simple-timing/config
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-timing/m5stats.txt
b/tests/long/10.mcf/ref/sparc/linux/simple-timing/stats
rename from tests/long/10.mcf/ref/sparc/linux/simple-timing/m5stats.txt
rename to tests/long/10.mcf/ref/sparc/linux/simple-timing/stats
diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
b/tests/long/10.mcf/ref/x86/linux/simple-atomic/config
rename from tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
rename to tests/long/10.mcf/ref/x86/linux/simple-atomic/config
diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stats
rename from tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
rename to tests/long/10.mcf/ref/x86/linux/simple-atomic/stats
diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
b/tests/long/20.parser/ref/x86/linux/simple-atomic/config
rename from tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
rename to tests/long/20.parser/ref/x86/linux/simple-atomic/config
diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/m5stats.txt
b/tests/long/20.parser/ref/x86/linux/simple-atomic/stats
rename from tests/long/20.parser/ref/x86/linux/simple-atomic/m5stats.txt
rename to tests/long/20.parser/ref/x86/linux/simple-atomic/stats
diff --git a/tests/long/30.eon/ref/alpha/tru64/o3-timing/config.ini
b/tests/long/30.eon/ref/alpha/tru64/o3-timing/config
rename from tests/long/30.eon/ref/alpha/tru64/o3-timing/config.ini
rename to tests/long/30.eon/ref/alpha/tru64/o3-timing/config
diff --git a/tests/long/30.eon/ref/alpha/tru64/o3-timing/m5stats.txt
b/tests/long/30.eon/ref/alpha/tru64/o3-timing/stats
rename from tests/long/30.eon/ref/alpha/tru64/o3-timing/m5stats.txt
rename to tests/long/30.eon/ref/alpha/tru64/o3-timing/stats
diff --git a/tests/long/30.eon/ref/alpha/tru64/simple-atomic/config.ini
b/tests/long/30.eon/ref/alpha/tru64/simple-atomic/config
rename from tests/long/30.eon/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/long/30.eon/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/long/30.eon/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/long/30.eon/ref/alpha/tru64/simple-atomic/stats
rename from tests/long/30.eon/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/long/30.eon/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/long/30.eon/ref/alpha/tru64/simple-timing/config.ini
b/tests/long/30.eon/ref/alpha/tru64/simple-timing/config
rename from tests/long/30.eon/ref/alpha/tru64/simple-timing/config.ini
rename to tests/long/30.eon/ref/alpha/tru64/simple-timing/config
diff --git a/tests/long/30.eon/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/long/30.eon/ref/alpha/tru64/simple-timing/stats
rename from tests/long/30.eon/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/long/30.eon/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config.ini
b/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config
rename from tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/stats
rename from tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config.ini
b/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config
rename from tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config.ini
rename to tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config
diff --git a/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/stats
rename from tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.ini
b/tests/long/50.vortex/ref/alpha/tru64/o3-timing/config
rename from tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.ini
rename to tests/long/50.vortex/ref/alpha/tru64/o3-timing/config
diff --git a/tests/long/50.vortex/ref/alpha/tru64/o3-timing/m5stats.txt
b/tests/long/50.vortex/ref/alpha/tru64/o3-timing/stats
rename from tests/long/50.vortex/ref/alpha/tru64/o3-timing/m5stats.txt
rename to tests/long/50.vortex/ref/alpha/tru64/o3-timing/stats
diff --git a/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config.ini
b/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config
rename from tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/stats
rename from tests/long/50.vortex/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/long/50.vortex/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/long/50.vortex/ref/alpha/tru64/simple-timing/config.ini
b/tests/long/50.vortex/ref/alpha/tru64/simple-timing/config
rename from tests/long/50.vortex/ref/alpha/tru64/simple-timing/config.ini
rename to tests/long/50.vortex/ref/alpha/tru64/simple-timing/config
diff --git a/tests/long/50.vortex/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/long/50.vortex/ref/alpha/tru64/simple-timing/stats
rename from tests/long/50.vortex/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/long/50.vortex/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.ini
b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config
rename from tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.ini
rename to tests/long/50.vortex/ref/sparc/linux/simple-atomic/config
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/m5stats.txt
b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/stats
rename from tests/long/50.vortex/ref/sparc/linux/simple-atomic/m5stats.txt
rename to tests/long/50.vortex/ref/sparc/linux/simple-atomic/stats
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.ini
b/tests/long/50.vortex/ref/sparc/linux/simple-timing/config
rename from tests/long/50.vortex/ref/sparc/linux/simple-timing/config.ini
rename to tests/long/50.vortex/ref/sparc/linux/simple-timing/config
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-timing/m5stats.txt
b/tests/long/50.vortex/ref/sparc/linux/simple-timing/stats
rename from tests/long/50.vortex/ref/sparc/linux/simple-timing/m5stats.txt
rename to tests/long/50.vortex/ref/sparc/linux/simple-timing/stats
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.ini
b/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config
rename from tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.ini
rename to tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/m5stats.txt
b/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/stats
rename from tests/long/60.bzip2/ref/alpha/tru64/o3-timing/m5stats.txt
rename to tests/long/60.bzip2/ref/alpha/tru64/o3-timing/stats
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config.ini
b/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config
rename from tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/stats
rename from tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config.ini
b/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config
rename from tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config.ini
rename to tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/stats
rename from tests/long/60.bzip2/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/long/60.bzip2/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config
rename from tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
rename to tests/long/60.bzip2/ref/x86/linux/simple-atomic/config
diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stats
rename from tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
rename to tests/long/60.bzip2/ref/x86/linux/simple-atomic/stats
diff --git a/tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.ini
b/tests/long/70.twolf/ref/alpha/tru64/o3-timing/config
rename from tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.ini
rename to tests/long/70.twolf/ref/alpha/tru64/o3-timing/config
diff --git a/tests/long/70.twolf/ref/alpha/tru64/o3-timing/m5stats.txt
b/tests/long/70.twolf/ref/alpha/tru64/o3-timing/stats
rename from tests/long/70.twolf/ref/alpha/tru64/o3-timing/m5stats.txt
rename to tests/long/70.twolf/ref/alpha/tru64/o3-timing/stats
diff --git a/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config.ini
b/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config
rename from tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/stats
rename from tests/long/70.twolf/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/long/70.twolf/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/long/70.twolf/ref/alpha/tru64/simple-timing/config.ini
b/tests/long/70.twolf/ref/alpha/tru64/simple-timing/config
rename from tests/long/70.twolf/ref/alpha/tru64/simple-timing/config.ini
rename to tests/long/70.twolf/ref/alpha/tru64/simple-timing/config
diff --git a/tests/long/70.twolf/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/long/70.twolf/ref/alpha/tru64/simple-timing/stats
rename from tests/long/70.twolf/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/long/70.twolf/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini
b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config
rename from tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini
rename to tests/long/70.twolf/ref/sparc/linux/simple-atomic/config
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/m5stats.txt
b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats
rename from tests/long/70.twolf/ref/sparc/linux/simple-atomic/m5stats.txt
rename to tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini
b/tests/long/70.twolf/ref/sparc/linux/simple-timing/config
rename from tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini
rename to tests/long/70.twolf/ref/sparc/linux/simple-timing/config
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-timing/m5stats.txt
b/tests/long/70.twolf/ref/sparc/linux/simple-timing/stats
rename from tests/long/70.twolf/ref/sparc/linux/simple-timing/m5stats.txt
rename to tests/long/70.twolf/ref/sparc/linux/simple-timing/stats
diff --git a/tests/long/70.twolf/ref/x86/linux/simple-atomic/config.ini
b/tests/long/70.twolf/ref/x86/linux/simple-atomic/config
rename from tests/long/70.twolf/ref/x86/linux/simple-atomic/config.ini
rename to tests/long/70.twolf/ref/x86/linux/simple-atomic/config
diff --git a/tests/long/70.twolf/ref/x86/linux/simple-atomic/m5stats.txt
b/tests/long/70.twolf/ref/x86/linux/simple-atomic/stats
rename from tests/long/70.twolf/ref/x86/linux/simple-atomic/m5stats.txt
rename to tests/long/70.twolf/ref/x86/linux/simple-atomic/stats
diff --git
a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config
rename from
tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
rename to
tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config
diff --git
a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/m5stats.txt
b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats
rename from
tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/m5stats.txt
rename to tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats
diff --git a/tests/quick/00.hello/ref/alpha/linux/o3-timing/config.ini
b/tests/quick/00.hello/ref/alpha/linux/o3-timing/config
rename from tests/quick/00.hello/ref/alpha/linux/o3-timing/config.ini
rename to tests/quick/00.hello/ref/alpha/linux/o3-timing/config
diff --git a/tests/quick/00.hello/ref/alpha/linux/o3-timing/m5stats.txt
b/tests/quick/00.hello/ref/alpha/linux/o3-timing/stats
rename from tests/quick/00.hello/ref/alpha/linux/o3-timing/m5stats.txt
rename to tests/quick/00.hello/ref/alpha/linux/o3-timing/stats
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.ini
b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/config
rename from tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.ini
rename to tests/quick/00.hello/ref/alpha/linux/simple-atomic/config
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt
b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stats
rename from tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt
rename to tests/quick/00.hello/ref/alpha/linux/simple-atomic/stats
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-timing/config.ini
b/tests/quick/00.hello/ref/alpha/linux/simple-timing/config
rename from tests/quick/00.hello/ref/alpha/linux/simple-timing/config.ini
rename to tests/quick/00.hello/ref/alpha/linux/simple-timing/config
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-timing/m5stats.txt
b/tests/quick/00.hello/ref/alpha/linux/simple-timing/stats
rename from tests/quick/00.hello/ref/alpha/linux/simple-timing/m5stats.txt
rename to tests/quick/00.hello/ref/alpha/linux/simple-timing/stats
diff --git a/tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.ini
b/tests/quick/00.hello/ref/alpha/tru64/o3-timing/config
rename from tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.ini
rename to tests/quick/00.hello/ref/alpha/tru64/o3-timing/config
diff --git a/tests/quick/00.hello/ref/alpha/tru64/o3-timing/m5stats.txt
b/tests/quick/00.hello/ref/alpha/tru64/o3-timing/stats
rename from tests/quick/00.hello/ref/alpha/tru64/o3-timing/m5stats.txt
rename to tests/quick/00.hello/ref/alpha/tru64/o3-timing/stats
diff --git a/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.ini
b/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config
rename from tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config
diff --git a/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/m5stats.txt
b/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/stats
rename from tests/quick/00.hello/ref/alpha/tru64/simple-atomic/m5stats.txt
rename to tests/quick/00.hello/ref/alpha/tru64/simple-atomic/stats
diff --git a/tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.ini
b/tests/quick/00.hello/ref/alpha/tru64/simple-timing/config
rename from tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.ini
rename to tests/quick/00.hello/ref/alpha/tru64/simple-timing/config
diff --git a/tests/quick/00.hello/ref/alpha/tru64/simple-timing/m5stats.txt
b/tests/quick/00.hello/ref/alpha/tru64/simple-timing/stats
rename from tests/quick/00.hello/ref/alpha/tru64/simple-timing/m5stats.txt
rename to tests/quick/00.hello/ref/alpha/tru64/simple-timing/stats
diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini
b/tests/quick/00.hello/ref/mips/linux/simple-atomic/config
rename from tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini
rename to tests/quick/00.hello/ref/mips/linux/simple-atomic/config
diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt
b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stats
rename from tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt
rename to tests/quick/00.hello/ref/mips/linux/simple-atomic/stats
diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing/config.ini
b/tests/quick/00.hello/ref/mips/linux/simple-timing/config
rename from tests/quick/00.hello/ref/mips/linux/simple-timing/config.ini
rename to tests/quick/00.hello/ref/mips/linux/simple-timing/config
diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing/m5stats.txt
b/tests/quick/00.hello/ref/mips/linux/simple-timing/stats
rename from tests/quick/00.hello/ref/mips/linux/simple-timing/m5stats.txt
rename to tests/quick/00.hello/ref/mips/linux/simple-timing/stats
diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.ini
b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/config
rename from tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.ini
rename to tests/quick/00.hello/ref/sparc/linux/simple-atomic/config
diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt
b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stats
rename from tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt
rename to tests/quick/00.hello/ref/sparc/linux/simple-atomic/stats
diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-timing/config.ini
b/tests/quick/00.hello/ref/sparc/linux/simple-timing/config
rename from tests/quick/00.hello/ref/sparc/linux/simple-timing/config.ini
rename to tests/quick/00.hello/ref/sparc/linux/simple-timing/config
diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-timing/m5stats.txt
b/tests/quick/00.hello/ref/sparc/linux/simple-timing/stats
rename from tests/quick/00.hello/ref/sparc/linux/simple-timing/m5stats.txt
rename to tests/quick/00.hello/ref/sparc/linux/simple-timing/stats
diff --git a/tests/quick/00.hello/ref/x86/linux/simple-atomic/config.ini
b/tests/quick/00.hello/ref/x86/linux/simple-atomic/config
rename from tests/quick/00.hello/ref/x86/linux/simple-atomic/config.ini
rename to tests/quick/00.hello/ref/x86/linux/simple-atomic/config
diff --git a/tests/quick/00.hello/ref/x86/linux/simple-atomic/m5stats.txt
b/tests/quick/00.hello/ref/x86/linux/simple-atomic/stats
rename from tests/quick/00.hello/ref/x86/linux/simple-atomic/m5stats.txt
rename to tests/quick/00.hello/ref/x86/linux/simple-atomic/stats
diff --git a/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini
b/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config
rename from tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini
rename to tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config
diff --git a/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/m5stats.txt
b/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats
rename from tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/m5stats.txt
rename to tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats
diff --git a/tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.ini
b/tests/quick/02.insttest/ref/sparc/linux/o3-timing/config
rename from tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.ini
rename to tests/quick/02.insttest/ref/sparc/linux/o3-timing/config
diff --git a/tests/quick/02.insttest/ref/sparc/linux/o3-timing/m5stats.txt
b/tests/quick/02.insttest/ref/sparc/linux/o3-timing/stats
rename from tests/quick/02.insttest/ref/sparc/linux/o3-timing/m5stats.txt
rename to tests/quick/02.insttest/ref/sparc/linux/o3-timing/stats
diff --git a/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.ini
b/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config
rename from tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.ini
rename to tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config
diff --git a/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/m5stats.txt
b/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/stats
rename from tests/quick/02.insttest/ref/sparc/linux/simple-atomic/m5stats.txt
rename to tests/quick/02.insttest/ref/sparc/linux/simple-atomic/stats
diff --git a/tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.ini
b/tests/quick/02.insttest/ref/sparc/linux/simple-timing/config
rename from tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.ini
rename to tests/quick/02.insttest/ref/sparc/linux/simple-timing/config
diff --git a/tests/quick/02.insttest/ref/sparc/linux/simple-timing/m5stats.txt
b/tests/quick/02.insttest/ref/sparc/linux/simple-timing/stats
rename from tests/quick/02.insttest/ref/sparc/linux/simple-timing/m5stats.txt
rename to tests/quick/02.insttest/ref/sparc/linux/simple-timing/stats
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/console.system.sim_console
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/system.terminal
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/console.system.sim_console
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/system.terminal
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
rename to tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
rename to tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/console.system.sim_console
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/system.terminal
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/console.system.sim_console
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/system.terminal
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/system.terminal
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/system.terminal
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
rename to tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt
rename to tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats
diff --git
a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/console.system.sim_console
b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/system.terminal
rename from
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/console.system.sim_console
rename to
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/system.terminal
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini
b/tests/quick/20.eio-short/ref/alpha/eio/detailed/config
rename from tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini
rename to tests/quick/20.eio-short/ref/alpha/eio/detailed/config
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt
b/tests/quick/20.eio-short/ref/alpha/eio/detailed/stats
rename from tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt
rename to tests/quick/20.eio-short/ref/alpha/eio/detailed/stats
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config
rename from tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
rename to tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stats
rename from tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
rename to tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stats
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config
rename from tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
rename to tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stats
rename from tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
rename to tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stats
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest/config.ini
b/tests/quick/50.memtest/ref/alpha/linux/memtest/config
rename from tests/quick/50.memtest/ref/alpha/linux/memtest/config.ini
rename to tests/quick/50.memtest/ref/alpha/linux/memtest/config
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest/m5stats.txt
b/tests/quick/50.memtest/ref/alpha/linux/memtest/stats
rename from tests/quick/50.memtest/ref/alpha/linux/memtest/m5stats.txt
rename to tests/quick/50.memtest/ref/alpha/linux/memtest/stats
diff --git
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config
rename from
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
rename to
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config
diff --git
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal
rename from
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console
rename to
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal
diff --git
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats
rename from
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt
rename to
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats
diff --git
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal
rename from
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console
rename to
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
