Remove blocks of codes / files which are marked as INTERNAL_ONLY and Disable validati...

Change-Id: I9c458f87e34bcb2fa509fedfdc1654888d009be3
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>

diff --git a/tests/SConscript b/tests/SConscript
index 8634f5c410d43841fc2d528e7f10792652641ec8..ae5337520f67db3019aea552ae5926b473437ac0 100644 (file)
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -31,7 +31,6 @@ 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", False),
     BoolVariable("benchmark_tests", "Build benchmark test programs", False),
     ("test_filter", "Pattern to specify the tests' filenames to be compiled", "*.cpp")
@@ -95,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')
@@ -114,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':