From ac32645c27c51f5eb5e20adecab4758352265aa5 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Thu, 7 Dec 2006 14:41:56 -0500 Subject: Change detault regression build from opt to fast. --HG-- extra : convert_revision : b6db0254b73a97ab6e3685c90cc9cd30ea274d4f --- util/regress | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/regress') diff --git a/util/regress b/util/regress index 8e60b6fee..83d8b4ddc 100755 --- a/util/regress +++ b/util/regress @@ -43,7 +43,7 @@ optparser.add_option('--builds', dest='builds', help='comma-separated list of build targets to test ' " (default: '%default')" ) optparser.add_option('--variants', dest='variants', - default='opt', + default='fast', help='comma-separated list of build variants to test ' " (default: '%default')" ) optparser.add_option('--scons-opts', dest='scons_opts', default='', -- cgit v1.2.3 From 96d1efe0a9bacebe54cbf883357ce4d6c6e1f25d Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sun, 10 Dec 2006 01:42:16 -0500 Subject: Add '-j' option directly to regress script (passed to scons). --HG-- extra : convert_revision : 9776806b24da70b815280e47d2d5ec8674c82669 --- util/regress | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'util/regress') diff --git a/util/regress b/util/regress index 8e60b6fee..930a8be48 100755 --- a/util/regress +++ b/util/regress @@ -48,6 +48,8 @@ optparser.add_option('--variants', dest='variants', " (default: '%default')" ) optparser.add_option('--scons-opts', dest='scons_opts', default='', help='scons options', metavar='OPTS') +optparser.add_option('-j', '--jobs', type='int', default=1, + help='number of parallel jobs to use') (options, tests) = optparser.parse_args() @@ -88,7 +90,11 @@ try: for variant in variants for test in tests] - system('scons %s %s' % (options.scons_opts, ' '.join(targets))) + scons_opts = options.scons_opts + if options.jobs != 1: + scons_opts += ' -j %d' % options.jobs + + system('scons %s %s' % (scons_opts, ' '.join(targets))) sys.exit(0) -- cgit v1.2.3 From a7ea4885cebed69a56bb230955484fabb23ca986 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 12 Dec 2006 09:54:59 -0800 Subject: If no tests are specified for regression, just build the binaries (instead of complaining and exiting). --HG-- extra : convert_revision : 24ac0bab7fd92d9e74c80847a667f0affcd0473d --- util/regress | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'util/regress') diff --git a/util/regress b/util/regress index 4492162eb..5d6f321f2 100755 --- a/util/regress +++ b/util/regress @@ -77,10 +77,11 @@ def shellquote(s): try: if not tests: - print "No tests specified." - sys.exit(1) - - if 'all' in 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] -- cgit v1.2.3