Remove blocks of codes / files which are marked as INTERNAL_ONLY and Disable validation and benchmark tests

Change-Id: I6ca368ee142e7412925cb453d6d64e33d9714af6
Signed-off-by: Giuseppe Rossini <giuseppe.rossini@arm.com>

2 files changed, 2 insertions, 22 deletions

diff --git a/SConstruct b/SConstruct
index 83b1409c4c..e7bfa4e05b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -61,8 +61,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 5c95c551f4..ad0324fa22 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -30,9 +30,8 @@ Import('install_bin')
 variables = [
     BoolVariable("benchmark_examples", "Build benchmark examples programs", True),
     BoolVariable("validate_examples", "Build validate examples programs", 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")
 ]
 
@@ -87,10 +86,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'])])
 
@@ -98,9 +93,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')
@@ -117,23 +109,13 @@ 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':