SConscript (5721:11e6f4fa85c3) SConscript (5773:7434b2271b0c)
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2006 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 44 unchanged lines hidden (view full) ---

53 target[2] : status
54
55 """
56 # make sure target files are all gone
57 for t in target:
58 if os.path.exists(t.abspath):
59 Execute(Delete(t.abspath))
60 # Run diff on output & ref directories to find differences.
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2006 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 44 unchanged lines hidden (view full) ---

53 target[2] : status
54
55 """
56 # make sure target files are all gone
57 for t in target:
58 if os.path.exists(t.abspath):
59 Execute(Delete(t.abspath))
60 # Run diff on output & ref directories to find differences.
61 # Exclude m5stats.txt since we will use diff-out on that.
61 # Exclude the stats file since we will use diff-out on that.
62 Execute(env.subst('diff -ubr ${SOURCES[0].dir} ${SOURCES[1].dir} ' +
63 '-I "^command line:" ' + # for stdout file
64 '-I "^M5 compiled " ' + # for stderr file
65 '-I "^M5 started " ' + # for stderr file
66 '-I "^M5 executing on " ' + # for stderr file
67 '-I "^Simulation complete at" ' + # for stderr file
68 '-I "^Listening for" ' + # for stderr file
69 '-I "listening for remote gdb" ' + # for stderr file
62 Execute(env.subst('diff -ubr ${SOURCES[0].dir} ${SOURCES[1].dir} ' +
63 '-I "^command line:" ' + # for stdout file
64 '-I "^M5 compiled " ' + # for stderr file
65 '-I "^M5 started " ' + # for stderr file
66 '-I "^M5 executing on " ' + # for stderr file
67 '-I "^Simulation complete at" ' + # for stderr file
68 '-I "^Listening for" ' + # for stderr file
69 '-I "listening for remote gdb" ' + # for stderr file
70 '--exclude=m5stats.txt --exclude=SCCS ' +
70 '--exclude=stats.txt --exclude=SCCS ' +
71 '--exclude=${TARGETS[0].file} ' +
72 '> ${TARGETS[0]}', target=target, source=source), None)
73 print "===== Output differences ====="
74 print contents(target[0])
71 '--exclude=${TARGETS[0].file} ' +
72 '> ${TARGETS[0]}', target=target, source=source), None)
73 print "===== Output differences ====="
74 print contents(target[0])
75 # Run diff-out on m5stats.txt file
75 # Run diff-out on stats.txt file
76 status = Execute(env.subst('$DIFFOUT $SOURCES > ${TARGETS[1]}',
77 target=target, source=source),
78 strfunction=None)
79 print "===== Statistics differences ====="
80 print contents(target[1])
81 # Generate status file contents based on exit status of diff-out
82 if status == 0:
83 status_str = "passed."

--- 22 unchanged lines hidden (view full) ---

106# - long-winded message about ignored sources
107ignore_msg = '''
108Note: The following file(s) will not be copied. New non-standard
109 output files must be copied manually once before update_ref will
110 recognize them as outputs. Otherwise they are assumed to be
111 inputs and are ignored.
112'''
113# - reference files always needed
76 status = Execute(env.subst('$DIFFOUT $SOURCES > ${TARGETS[1]}',
77 target=target, source=source),
78 strfunction=None)
79 print "===== Statistics differences ====="
80 print contents(target[1])
81 # Generate status file contents based on exit status of diff-out
82 if status == 0:
83 status_str = "passed."

--- 22 unchanged lines hidden (view full) ---

106# - long-winded message about ignored sources
107ignore_msg = '''
108Note: The following file(s) will not be copied. New non-standard
109 output files must be copied manually once before update_ref will
110 recognize them as outputs. Otherwise they are assumed to be
111 inputs and are ignored.
112'''
113# - reference files always needed
114needed_files = set(['stdout', 'stderr', 'm5stats.txt', 'config.ini'])
114needed_files = set(['simout', 'simerr', 'stats.txt', 'config.ini'])
115# - source files we always want to ignore
116known_ignores = set(['status', 'outdiff', 'statsdiff'])
117
118def update_test(target, source, env):
119 """Update reference test outputs.
120
115# - source files we always want to ignore
116known_ignores = set(['status', 'outdiff', 'statsdiff'])
117
118def update_test(target, source, env):
119 """Update reference test outputs.
120
121 Target is phony. First two sources are the ref & new m5stats.txt
121 Target is phony. First two sources are the ref & new stats.txt file
122 files, respectively. We actually copy everything in the
123 respective directories except the status & diff output files.
124
125 """
126 dest_dir = str(source[0].get_dir())
127 src_dir = str(source[1].get_dir())
128 dest_files = set(os.listdir(dest_dir))
129 src_files = set(os.listdir(src_dir))

--- 35 unchanged lines hidden (view full) ---

165 # target path (where test output goes) is the same except without
166 # the 'ref' component
167 tgt_dir = os.path.join(category, name, isa, opsys, config)
168
169 # prepend file name with tgt_dir
170 def tgt(f):
171 return os.path.join(tgt_dir, f)
172
122 files, respectively. We actually copy everything in the
123 respective directories except the status & diff output files.
124
125 """
126 dest_dir = str(source[0].get_dir())
127 src_dir = str(source[1].get_dir())
128 dest_files = set(os.listdir(dest_dir))
129 src_files = set(os.listdir(src_dir))

--- 35 unchanged lines hidden (view full) ---

165 # target path (where test output goes) is the same except without
166 # the 'ref' component
167 tgt_dir = os.path.join(category, name, isa, opsys, config)
168
169 # prepend file name with tgt_dir
170 def tgt(f):
171 return os.path.join(tgt_dir, f)
172
173 ref_stats = os.path.join(ref_dir, 'm5stats.txt')
174 new_stats = tgt('m5stats.txt')
173 ref_stats = os.path.join(ref_dir, 'stats.txt')
174 new_stats = tgt('stats.txt')
175 status_file = tgt('status')
176
177 # Base command for running test. We mess around with indirectly
178 # referring to files via SOURCES and TARGETS so that scons can
179 # mess with paths all it wants to and we still get the right
180 # files.
175 status_file = tgt('status')
176
177 # Base command for running test. We mess around with indirectly
178 # referring to files via SOURCES and TARGETS so that scons can
179 # mess with paths all it wants to and we still get the right
180 # files.
181 cmd = '${SOURCES[0]} -d $TARGET.dir'
182 cmd += ' -re --stdout-file stdout --stderr-file stderr'
183 cmd += ' ${SOURCES[1]} %s' % tgt_dir
181 cmd = '${SOURCES[0]} -d $TARGET.dir -re ${SOURCES[1]} %s' % tgt_dir
184
185 # Prefix test run with batch job submission command if appropriate.
186 # Batch command also supports timeout arg (in seconds, not minutes).
187 timeout = 15 * 60 # used to be a param, probably should be again
188 if env['BATCH']:
189 cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd)
190
182
183 # Prefix test run with batch job submission command if appropriate.
184 # Batch command also supports timeout arg (in seconds, not minutes).
185 timeout = 15 * 60 # used to be a param, probably should be again
186 if env['BATCH']:
187 cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd)
188
191 env.Command([tgt('stdout'), tgt('stderr'), new_stats],
189 env.Command([tgt('simout'), tgt('simerr'), new_stats],
192 [env.M5Binary, 'run.py'], cmd)
193
194 # order of targets is important... see check_test
195 env.Command([tgt('outdiff'), tgt('statsdiff'), status_file],
196 [ref_stats, new_stats],
197 testAction)
198
199 # phony target to echo status

--- 36 unchanged lines hidden --- 		190 [env.M5Binary, 'run.py'], cmd)
191
192 # order of targets is important... see check_test
193 env.Command([tgt('outdiff'), tgt('statsdiff'), status_file],
194 [ref_stats, new_stats],
195 testAction)
196
197 # phony target to echo status

--- 36 unchanged lines hidden ---