diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/SConscript | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/tests/SConscript b/tests/SConscript index 9e6c78d8c5..73f5ad716f 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -31,9 +31,8 @@ variables = [ BoolVariable("benchmark_examples", "Build benchmark examples programs", True), BoolVariable("validate_examples", "Build validate examples programs", True), BoolVariable("reference_openmp", "Build reference validation with openmp", True), - #FIXME Switch the following two options to False before releasing - BoolVariable("validation_tests", "Build validation test programs", True), - BoolVariable("benchmark_tests", "Build benchmark test programs", True), + BoolVariable("validation_tests", "Build validation test programs", False), + BoolVariable("benchmark_tests", "Build benchmark test programs", False), ("test_filter", "Pattern to specify the tests' filenames to be compiled", "*.cpp") ] @@ -88,10 +87,6 @@ else: if env['os'] in ['bare_metal']: Import("bootcode_o") -#FIXME Delete before release -if env['internal_only']: - test_env.Append(CPPDEFINES=['INTERNAL_ONLY']) - test_env.Append(CPPPATH = ["#3rdparty/include"]) test_env.Append(LIBPATH = ["#3rdparty/%s/%s" % (env['os'], env['arch'])]) @@ -99,9 +94,6 @@ common_files = Glob('*.cpp') common_objects = [test_env.StaticObject(f) for f in common_files] files_benchmark = Glob('benchmark/*.cpp') -#FIXME Delete before release -if env['internal_only']: - files_benchmark += Glob('../3rdparty/tests/benchmark/*.cpp') # Add unit tests files_validation = Glob('validation/UNIT/*/*.cpp') @@ -118,23 +110,14 @@ if env['opencl']: files_benchmark += Glob('benchmark/CL/*/' + filter_pattern) files_benchmark += Glob('benchmark/CL/' + filter_pattern) - #FIXME Delete before release - if env['internal_only']: - files_benchmark += Glob('../3rdparty/tests/benchmark/CL/' + filter_pattern) files_validation += Glob('validation/CL/*/' + filter_pattern) files_validation += Glob('validation/CL/' + filter_pattern) - #FIXME Delete before release - if env['internal_only']: - files_validation += Glob('../3rdparty/tests/validation/CL/' + filter_pattern) if env['neon']: filter_pattern = test_env['test_filter'] files_benchmark += Glob('benchmark/NEON/*/' + filter_pattern) files_benchmark += Glob('benchmark/NEON/' + filter_pattern) - #FIXME Delete before release - if env['internal_only']: - files_benchmark += Glob('../3rdparty/tests/benchmark/NEON/' + filter_pattern) files_validation += Glob('validation/NEON/' + filter_pattern) if env['os'] == 'bare_metal': |