Refactoring of tools/test.py

- Removed '--fast'  (As requested by Jacob / Martyn).
- Removed '--simulator' (Unused).
- Changed default targets to [ 'a64', 't32', 'a64,a32,t32'] as requested
by Jacob.
- Fixed negative_testing handling (Still disabled by default).
- tools/test.py refactoring / simplification:
  - Removed TestOption classed and used a custom argparse.Action
  instead.
  - Keep environment_options and build_options as dictionaries instead
    of strings.
  - Simplified CanRunAarch64 / CanRunAarch32.
  - Simplified ListCombinations
  - Explicitely pass variables around instead of relying on
    global variables.
  - Created a ReturnCode class.
- Cap the maximum number of threads to 32.

Takes about 31min to run on x86 (Using cccache but not regrouping the
tests at the end of the run).

Change-Id: I381b80e866974d82d7caeb2e6b7e5483f395aab2

1 files changed, 5 insertions, 4 deletions

diff --git a/SConstruct b/SConstruct
index 8e95062c..1e92e5d0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -277,9 +277,6 @@ def RetrieveEnvironmentVariables(env):
     env.Append(CXXFLAGS = os.getenv('CXXFLAGS').split())
   if os.getenv('LINKFLAGS'):
     env.Append(LINKFLAGS = os.getenv('LINKFLAGS').split())
-  # This allows colors to be displayed when using with clang.
-  env['ENV']['TERM'] = os.getenv('TERM')
-
 
 # The architecture targeted by default will depend on the compiler being
 # used. 'host_arch' is extracted from the compiler while 'target' can be
@@ -457,13 +454,17 @@ env = Environment(variables = vars,
                   BUILDERS = {
                       'Markdown': Builder(action = 'markdown $SOURCE > $TARGET',
                                           suffix = '.html')
-                  })
+                  }, ENV = os.environ)
 # Abort the build if any command line option is unknown or invalid.
 unknown_build_options = vars.UnknownVariables()
 if unknown_build_options:
   print 'Unknown build options:',  unknown_build_options.keys()
   Exit(1)
 
+if env['negative_testing'] == 'on' and env['mode'] != 'debug':
+  print 'negative_testing only works in debug mode'
+  Exit(1)
+
 ConfigureEnvironment(env)
 Help(vars.GenerateHelpText(env))
 libvixl = VIXLLibraryTarget(env)