From a0759f0fb7ad10af8ba15bfc80ac317cd0ca9eb1 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 25 Aug 2006 13:04:21 -0400 Subject: Update for new regression test structure. --HG-- extra : convert_revision : f533bc237710c2c634a20e51733f66f9f5dd0929 --- util/regress | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'util') diff --git a/util/regress b/util/regress index 067f9f092..27880d527 100755 --- a/util/regress +++ b/util/regress @@ -1,5 +1,5 @@ #! /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. # # 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, help='rebuld from scratch') 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') optparser.add_option('--variants', dest='variants', default='opt', @@ -74,7 +74,7 @@ builds = options.builds.split(',') variants = options.variants.split(',') # Repositories to clone/update -repos = ['m5', 'm5-test', 'ext'] +repos = ['m5'] # Call os.system() and raise exception if return status is non-zero def system(cmd): @@ -140,11 +140,18 @@ try: sys.exit(1) if options.verbose: - print 'cd m5/build' - os.chdir('m5/build') - - targets = ['%s/test/%s/%s' % (build, variant, test) - for build in builds for variant in variants for test in tests] + print 'cd m5' + os.chdir('m5') + + if 'all' 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))) -- cgit v1.2.3