Merge IGNORE_STYLE change and my change.

--HG--
extra : convert_revision : 13880ec6df17b0317d4097243bb24add753a098a

diff --cc util/regress
index fd4bd8863296bfee38b95cb0aad3153318e93a7d,5723eb17116e113af7dc15ce492c61f3177b7207..84f925ba4db1058fb47608be720e58c1121f9f2d
--- 1/util/regress
--- 2/util/regress
+++ b/util/regress
@@@ -82,30 -75,34 +82,30 @@@ def shellquote(s)
          s = "'%s'" % s
      return s
  
 -try:
 -    if not tests:
 -        print "No tests specified, just building binaries."
 -        targets = ['build/%s/m5.%s' % (build, variant)
 -                 for build in builds
 -                 for variant in variants]
 -    elif 'all' in tests:
 -      targets = ['build/%s/tests/%s' % (build, variant)
 -                 for build in builds
 -                 for variant in variants]
 -    else:
 -        # Ugly! Since we don't have any quick SPARC_FS tests remove the SPARC_FS target
 -        # If we ever get a quick SPARC_FS test, this code should be removed
 -        if 'quick' in tests and 'SPARC_FS' in builds:
 -            builds.remove('SPARC_FS')
 -      targets = ['build/%s/tests/%s/%s' % (build, variant, test)
 -                 for build in builds
 -                 for variant in variants
 -                 for test in tests]
++<<<<<<< /z/saidi/work/m5/util/regress
 +if not tests:
 +    print "No tests specified, just building binaries."
 +    targets = ['build/%s/m5.%s' % (build, variant)
 +               for build in builds
 +               for variant in variants]
 +elif 'all' in tests:
 +    targets = ['build/%s/tests/%s' % (build, variant)
 +               for build in builds
 +               for variant in variants]
 +else:
 +    # Ugly! Since we don't have any quick SPARC_FS tests remove the SPARC_FS target
 +    # If we ever get a quick SPARC_FS test, this code should be removed
 +    if 'quick' in tests and 'SPARC_FS' in builds:
 +        builds.remove('SPARC_FS')
 +    targets = ['build/%s/tests/%s/%s' % (build, variant, test)
 +               for build in builds
 +               for variant in variants
 +               for test in tests]
  
 -    scons_opts = options.scons_opts
 -    if options.jobs != 1:
 -        scons_opts += ' -j %d' % options.jobs
 +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)))
++system('scons IGNORE_STYLE=True %s %s' % (scons_opts, ' '.join(targets)))
  
 -    sys.exit(0)
 -
 -except OSError, exc:
 -    print "%s: " % progname, exc
 -    sys.exit(1)
 +sys.exit(0)
-