diff options
| author |   Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2014-12-26 17:34:45 +0200 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2014-12-26 17:34:45 +0200 |
| commit | 0f3c0f79bc83c3678c325f7e8e17dd031acaf77f (patch) | |
| tree | 09e1adf76b5038f9670f008d9eee48642eed8051 /tests/SConstruct | |
| parent | 8a28b70351baf09f2131fee2fc186a96d069cc2e (diff) | |
Move malloc support to tests/common directory
Diffstat (limited to 'tests/SConstruct')
| -rw-r--r-- | tests/SConstruct | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/SConstruct b/tests/SConstruct index 1890670b..9092d4f8 100644 --- a/tests/SConstruct +++ b/tests/SConstruct @@ -136,12 +136,18 @@ elif 'g++' in env['CXX'] or 'gcc' in env['CXX']: env.Append(CXXFLAGS = '-g -Wall -Werror -Wextra -Wno-missing-field-initializers') elif 'cl' in env['CXX']: env.Append(CXXFLAGS = '/Zi /W2 /WX') - + # Now include the SConscript files from all subdirectories import os.path env['VARIANT_DIR'] = 'build' env['BUILD'] = '#' + env['VARIANT_DIR'] env['COMMON'] = '#' + env['VARIANT_DIR'] + '/common' + +# Include common/SConscript first to make sure its exports are available +# to other SConscripts. +SConscript("common/SConscript", exports = 'env', variant_dir = env['VARIANT_DIR'] + '/common') + for subdir in Glob('*/SConscript') + Glob('regression/*/SConscript'): + if str(subdir).startswith("common"): continue SConscript(subdir, exports = 'env', variant_dir = env['VARIANT_DIR'] + '/' + os.path.dirname(str(subdir))) |