diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-08-13 23:44:26 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-08-13 23:44:26 -0400 |
| commit | 27ddf0b40e9b0bea1d75d825c7339c9fb9411bc9 (patch) | |
| tree | c6dea0a58fec9d5efecfb5559e3e1eaa24b33878 /util/regress | |
| parent | b069b81acf498a538b1ce4b30ff8b2d96b2ec8de (diff) | |
| parent | 9b4be6532741a511ca8f9e1d051269245814be8b (diff) | |
| download | gem5-27ddf0b40e9b0bea1d75d825c7339c9fb9411bc9.tar.xz | |
Merge IGNORE_STYLE change and my change.
--HG--
extra : convert_revision : 13880ec6df17b0317d4097243bb24add753a098a
Diffstat (limited to 'util/regress')
| -rwxr-xr-x | util/regress | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/regress b/util/regress index fd4bd8863..84f925ba4 100755 --- a/util/regress +++ b/util/regress @@ -82,6 +82,7 @@ def shellquote(s): s = "'%s'" % s return s +<<<<<<< /z/saidi/work/m5/util/regress if not tests: print "No tests specified, just building binaries." targets = ['build/%s/m5.%s' % (build, variant) @@ -105,7 +106,6 @@ scons_opts = options.scons_opts if options.jobs != 1: scons_opts += ' -j %d' % options.jobs -system('scons %s %s' % (scons_opts, ' '.join(targets))) +system('scons IGNORE_STYLE=True %s %s' % (scons_opts, ' '.join(targets))) sys.exit(0) - |