From a4e5e1e68069e5ac8a776a28211178fd959b13f2 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Thu, 5 Oct 2017 14:55:34 +0100 Subject: COMPMID-556 Don't build computer_vision and arm_compute_validation_old in non-internal builds Change-Id: Id4d03880ddec9c29d515724134c654221804b513 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/90392 Reviewed-by: Pablo Tello Reviewed-by: Gian Marco Iodice Tested-by: Kaizen --- SConstruct | 2 ++ tests/SConscript | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 4428a09cd0..4ef67efe0c 100644 --- a/SConstruct +++ b/SConstruct @@ -52,6 +52,8 @@ vars.AddVariables( BoolVariable("openmp", "Enable OpenMP backend", False), BoolVariable("cppthreads", "Enable C++11 threads backend", True), PathVariable("build_dir", "Specify sub-folder for the build", ".", PathVariable.PathAccept), + #FIXME Remove before release (And remove all references to INTERNAL_ONLY) + BoolVariable("internal_only", "Enable ARM internal only tests", True), ("extra_cxx_flags", "Extra CXX flags to be appended to the build command", "") ) diff --git a/tests/SConscript b/tests/SConscript index 6b826d0c84..ccda55b649 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -28,12 +28,11 @@ Import('vars') SConscript('./framework/SConscript', duplicate=0) #FIXME: Remove before release -SConscript('./validation_old/SConscript', duplicate=0) +if env['internal_only']: + SConscript('./validation_old/SConscript', duplicate=0) # vars is imported from arm_compute: variables = [ - #FIXME Remove before release (And remove all references to INTERNAL_ONLY) - BoolVariable("internal_only", "Enable ARM internal only tests", True), BoolVariable("validation_tests", "Build validation test programs", True), BoolVariable("benchmark_tests", "Build benchmark test programs", True) ] @@ -65,7 +64,7 @@ else: arm_compute_lib = arm_compute_so #FIXME Delete before release -if test_env['internal_only']: +if env['internal_only']: test_env.Append(CPPDEFINES=['INTERNAL_ONLY']) test_env.Append(CPPPATH = ["#3rdparty/include"]) -- cgit v1.2.1