From 1b56c8c695c3a033930529dcf71085d21953864c Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Thu, 21 May 2020 15:56:41 +0100 Subject: Remove blocks of codes / files which are marked as INTERNAL_ONLY and Disable validation and benchmark tests Change-Id: Ic45589643bebfb6db748d25db5bca48def297193 Signed-off-by: Manuel Bottini --- SConstruct | 2 -- tests/SConscript | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 668e9a73d9..a0f6520939 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 26d422c10b..8634f5c410 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -32,8 +32,8 @@ variables = [ 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 +88,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'])]) -- cgit v1.2.1