Speed up tests

Remove less useful build/test configurations, and reduce the number of
iterations used for benchmarks, as those results are unused.

Approximately 20% improvement in test time.

Change-Id: I34de589df8a8bfa7118c691b9f036ee70352040c

2 files changed, 4 insertions, 3 deletions

diff --git a/tools/config.py b/tools/config.py
index b492652c..bb009945 100644
--- a/tools/config.py
+++ b/tools/config.py
@@ -57,6 +57,6 @@ tested_compilers = ['clang++', 'g++']
 
 # The list of target arch/isa options to test with. Do not list 'all' as an
 # option since it is the default.
-build_options_target = ['a32', 't32', 'a32,t32', 'a64', 'a64,a32', 'a64,t32']
+build_options_target = ['a32', 't32', 'a32,t32', 'a64']
 # Negative testing is off by default, so do not list 'off' as an option.
 build_options_negative_testing = ['on']
diff --git a/tools/test.py b/tools/test.py
index fa075443..8300475a 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -399,13 +399,14 @@ def RunBenchmarks(options, args):
     for bench in benchmark_names:
       rc |= RunCommand(
         [os.path.realpath(
-          join(config.dir_build_latest, 'benchmarks/aarch32', bench))])
+          join(config.dir_build_latest, 'benchmarks/aarch32', bench)), '10'])
   if CanRunAarch64(options, args):
     benchmark_names = util.ListCCFilesWithoutExt(config.dir_aarch64_benchmarks)
     for bench in benchmark_names:
       rc |= RunCommand(
         [util.relrealpath(
-            join(config.dir_build_latest, 'benchmarks/aarch64', bench))])
+            join(config.dir_build_latest,
+                'benchmarks/aarch64', bench)), '10'])
   return rc