Update for new regression test structure.

--HG--
extra : convert_revision : f533bc237710c2c634a20e51733f66f9f5dd0929
This commit is contained in:
Steve Reinhardt 2006-08-25 13:04:21 -04:00
parent 383b2830b8
commit a0759f0fb7

View file

@ -1,5 +1,5 @@
#! /usr/bin/env python #! /usr/bin/env python
# Copyright (c) 2005 The Regents of The University of Michigan # Copyright (c) 2005-2006 The Regents of The University of Michigan
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@ optparser.add_option('--scratch', dest='scratch', action='store_true',
default=False, default=False,
help='rebuld from scratch') help='rebuld from scratch')
optparser.add_option('--builds', dest='builds', optparser.add_option('--builds', dest='builds',
default='ALPHA_SE,ALPHA_FS,ALPHA_FS_TL', default='ALPHA_SE,ALPHA_FS,MIPS_SE,SPARC_SE',
help='comma-separated list of builds to test') help='comma-separated list of builds to test')
optparser.add_option('--variants', dest='variants', optparser.add_option('--variants', dest='variants',
default='opt', default='opt',
@ -74,7 +74,7 @@ builds = options.builds.split(',')
variants = options.variants.split(',') variants = options.variants.split(',')
# Repositories to clone/update # Repositories to clone/update
repos = ['m5', 'm5-test', 'ext'] repos = ['m5']
# Call os.system() and raise exception if return status is non-zero # Call os.system() and raise exception if return status is non-zero
def system(cmd): def system(cmd):
@ -140,11 +140,18 @@ try:
sys.exit(1) sys.exit(1)
if options.verbose: if options.verbose:
print 'cd m5/build' print 'cd m5'
os.chdir('m5/build') os.chdir('m5')
targets = ['%s/test/%s/%s' % (build, variant, test) if 'all' in tests:
for build in builds for variant in variants for test in tests] targets = ['build/%s/tests/%s' % (build, variant)
for build in builds
for variant in variants]
else:
targets = ['build/%s/tests/%s/%s' % (build, variant, test)
for build in builds
for variant in variants
for test in tests]
system('scons %s %s' % (options.scons_opts, ' '.join(targets))) system('scons %s %s' % (options.scons_opts, ' '.join(targets)))