X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2FSConstruct;h=57167ccc9151926fd5c46c917385dcfb3ba057fc;hb=ec3bff4ba110ffad31fccdbf74c4c180fc041414;hp=b411b48e8090d754f4503967a90a33c302e4f969;hpb=3b36235cef2c1c5f3c79a33cb765de2ec1a2d01e;p=apps%2Fagl-service-can-low-level.git diff --git a/tests/SConstruct b/tests/SConstruct index b411b48e..57167ccc 100644 --- a/tests/SConstruct +++ b/tests/SConstruct @@ -19,8 +19,8 @@ env = Environment(ENV = os.environ, tools = ['default', 'nanopb']) # Allow overriding the compiler with scons CC=??? if 'CC' in ARGUMENTS: env.Replace(CC = ARGUMENTS['CC']) if 'CXX' in ARGUMENTS: env.Replace(CXX = ARGUMENTS['CXX']) -if 'CFLAGS' in ARGUMENTS: env.Append(CCFLAGS = ARGUMENTS['CFLAGS']) -if 'CXXFLAGS' in ARGUMENTS: env.Append(CCFLAGS = ARGUMENTS['CXXFLAGS']) +if 'CCFLAGS' in ARGUMENTS: env.Append(CCFLAGS = ARGUMENTS['CCFLAGS']) +if 'CXXFLAGS' in ARGUMENTS: env.Append(CXXFLAGS = ARGUMENTS['CXXFLAGS']) # Add the builders defined in site_init.py add_nanopb_builders(env) @@ -141,6 +141,6 @@ import os.path env['VARIANT_DIR'] = 'build' env['BUILD'] = '#' + env['VARIANT_DIR'] env['COMMON'] = '#' + env['VARIANT_DIR'] + '/common' -for subdir in Glob('*/SConscript'): +for subdir in Glob('*/SConscript') + Glob('regression/*/SConscript'): SConscript(subdir, exports = 'env', variant_dir = env['VARIANT_DIR'] + '/' + os.path.dirname(str(subdir)))