From 4c872e1242cbd008f56a94a8f9679c22f65d257f Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Fri, 14 Aug 2020 14:47:01 +0100 Subject: Remove blocks of codes / files which are marked as INTERNAL_ONLY and disable validation and benchmark tests default build Change-Id: I04b4d7592daf51c9d4b59ee1bd6d27e76f730c85 Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3767 Reviewed-by: Gian Marco Iodice Reviewed-by: Pablo Marquez Reviewed-by: SiCong Li Tested-by: Gian Marco Iodice --- SConstruct | 2 -- tests/SConscript | 21 ++------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/SConstruct b/SConstruct index 87e14ad779..373e561401 100644 --- a/SConstruct +++ b/SConstruct @@ -62,8 +62,6 @@ vars.AddVariables( PathVariable("install_dir", "Specify sub-folder for the install", "", PathVariable.PathAccept), BoolVariable("exceptions", "Enable/disable C++ exception support", True), PathVariable("linker_script", "Use an external linker script", "", PathVariable.PathAccept), - #FIXME Remove before release (And remove all references to INTERNAL_ONLY) - BoolVariable("internal_only", "Enable ARM internal only tests", False), ("toolchain_prefix", "Override the toolchain prefix", ""), ("compiler_prefix", "Override the compiler prefix", ""), ("extra_cxx_flags", "Extra CXX flags to be appended to the build command", ""), 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': -- cgit v1.2.1