COMPMID-415: Rename and move tests

The boost validation is now "standalone" in validation_old and builds as
arm_compute_validation_old. The new validation builds now as
arm_compute_validation.

Change-Id: Ib93ba848a25680ac60afb92b461d574a0757150d
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/86187
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

1 files changed, 30 insertions, 94 deletions

diff --git a/tests/SConscript b/tests/SConscript
index 92a8b59d29..9be03adeb7 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -25,6 +25,11 @@ import os.path
 Import('env')
 Import('vars')
 
+SConscript('./framework/SConscript', duplicate=0)
+
+#FIXME: Remove before release
+SConscript('./validation_old/SConscript', duplicate=0)
+
 # vars is imported from arm_compute:
 variables = [
     #FIXME Remove before release (And remove all references to INTERNAL_ONLY)
@@ -42,75 +47,10 @@ for v in variables:
     vars.Add(v)
 
 # Clone the environment to make sure we're not polluting the arm_compute one:
-old_validation_env = env.Clone()
-vars.Update(old_validation_env)
-
-Help(new_options.GenerateHelpText(old_validation_env))
-
-if env['os'] in ['android', 'bare_metal'] or env['standalone']:
-    Import('arm_compute_a')
-    old_validation_env.Append(LIBS = [arm_compute_a])
-    arm_compute_lib = arm_compute_a
-else:
-    Import('arm_compute_so')
-    old_validation_env.Append(LIBS = ["arm_compute"])
-    arm_compute_lib = arm_compute_so
-
-#FIXME Delete before release
-if old_validation_env['internal_only']:
-    old_validation_env.Append(CPPDEFINES=['INTERNAL_ONLY'])
-
-old_validation_env.Append(CPPPATH = [".", "#3rdparty/include"])
-old_validation_env.Append(LIBPATH = ["#3rdparty/%s/%s" % (env['os'], env['arch'])])
-old_validation_env.Append(LIBPATH = ["#build/%s" % env['build_dir']])
-old_validation_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']])
-old_validation_env.Append(LIBS = ['boost_program_options'])
-old_validation_env.Append(CXXFLAGS = ['-Wno-missing-field-initializers'])
-old_validation_env.Append(CPPDEFINES=['BOOST'])
-old_validation_env.Append(LIBS = ['boost_unit_test_framework'])
-
-old_files_validation = Glob('*.cpp')
-old_files_validation = [f for f in old_files_validation if "main.cpp" not in os.path.basename(str(f))]
-old_files_validation += Glob('validation/*.cpp')
-
-# Add unit tests
-old_files_validation += Glob('validation/UNIT/*.cpp')
-old_files_validation += Glob('validation/UNIT/*/*.cpp')
-
-if env['opencl']:
-    Import('opencl')
-
-    old_files_validation += Glob('validation/CL/*.cpp')
-    old_files_validation += Glob('validation/CL/*/*.cpp')
-    old_files_validation += Glob('validation/system_tests/CL/*.cpp')
-
-    old_validation_env.Append(LIBS = "OpenCL")
-    old_validation_env.Append(CPPDEFINES=['ARM_COMPUTE_CL'])
-
-if env['neon']:
-    old_files_validation += Glob('validation/NEON/*.cpp')
-    old_files_validation += Glob('validation/NEON/*/*.cpp')
-    old_files_validation += Glob('validation/system_tests/NEON/*.cpp')
-
-if env['os'] == 'android':
-    old_validation_env.Append(LIBS = ["log"])
-
-if old_validation_env['validation_tests']:
-    arm_compute_validation = old_validation_env.Program('arm_compute_validation', old_files_validation)
-    Depends(arm_compute_validation, arm_compute_lib)
-    if env['opencl']:
-        Depends(arm_compute_validation, opencl)
-    Default(arm_compute_validation)
-    Export('arm_compute_validation')
-
-#######################################################################
-# Using new framework
-#######################################################################
-
-# Clone the environment to make sure we're not polluting the arm_compute one:
 test_env = env.Clone()
-# Workaround to build both test systems in parallel
-test_env.VariantDir("new", ".", duplicate=0)
+vars.Update(test_env)
+
+Help(new_options.GenerateHelpText(test_env))
 
 if env['os'] in ['android', 'bare_metal'] or env['standalone']:
     Import("arm_compute_a")
@@ -122,29 +62,25 @@ else:
     arm_compute_lib = arm_compute_so
 
 #FIXME Delete before release
-if old_validation_env['internal_only']:
+if test_env['internal_only']:
     test_env.Append(CPPDEFINES=['INTERNAL_ONLY'])
 
-test_env.Append(CPPPATH = [".", "#3rdparty/include"])
+test_env.Append(CPPPATH = ["#3rdparty/include"])
 test_env.Append(LIBPATH = ["#3rdparty/%s/%s" % (env['os'], env['arch'])])
 test_env.Append(LIBPATH = ["#build/%s" % env['build_dir']])
-test_env.Append(LIBPATH = ["#build/%s/framework" % env['build_dir']])
 test_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']])
 
 Import("arm_compute_test_framework")
 test_env.Append(LIBS = arm_compute_test_framework)
 
-common_files = Glob('new/AssetsLibrary.cpp')
-common_files += Glob('new/RawTensor.cpp')
-common_files += Glob('new/main.cpp')
-
+common_files = Glob('*.cpp')
 common_objects = [test_env.StaticObject(f) for f in common_files]
 
-files_benchmark = Glob('new/benchmark_new/*.cpp')
-files_validation = Glob('new/validation_new/*.cpp')
+files_benchmark = Glob('benchmark/*.cpp')
+files_validation = Glob('validation/*.cpp')
 
 # Always compile reference for validation
-files_validation += Glob('new/validation_new/CPP/*.cpp')
+files_validation += Glob('validation/CPP/*.cpp')
 
 if env['opencl']:
     Import('opencl')
@@ -152,25 +88,25 @@ if env['opencl']:
     test_env.Append(CPPDEFINES=['ARM_COMPUTE_CL'])
     test_env.Append(LIBS = ["OpenCL"])
 
-    files_benchmark += Glob('new/benchmark_new/CL/*/*.cpp')
-    files_benchmark += Glob('new/benchmark_new/CL/*.cpp')
+    files_benchmark += Glob('benchmark/CL/*/*.cpp')
+    files_benchmark += Glob('benchmark/CL/*.cpp')
 
-    files_validation += Glob('new/validation_new/CL/*/*.cpp')
-    files_validation += Glob('new/validation_new/CL/*.cpp')
+    files_validation += Glob('validation/CL/*/*.cpp')
+    files_validation += Glob('validation/CL/*.cpp')
 
 if env['neon']:
-    files_benchmark += Glob('new/benchmark_new/NEON/*/*.cpp')
-    files_benchmark += Glob('new/benchmark_new/NEON/*.cpp')
+    files_benchmark += Glob('benchmark/NEON/*/*.cpp')
+    files_benchmark += Glob('benchmark/NEON/*.cpp')
 
-    files_validation += Glob('new/validation_new/NEON/*/*.cpp')
-    files_validation += Glob('new/validation_new/NEON/*.cpp')
+    files_validation += Glob('validation/NEON/*/*.cpp')
+    files_validation += Glob('validation/NEON/*.cpp')
 
 if env['os'] == 'android':
     test_env.Append(LIBS = ["log"])
 else:
     test_env.Append(LIBS = ["rt"])
 
-if old_validation_env['benchmark_tests']:
+if test_env['benchmark_tests']:
     arm_compute_benchmark = test_env.Program('arm_compute_benchmark', files_benchmark + common_objects)
     Depends(arm_compute_benchmark, arm_compute_test_framework)
     Depends(arm_compute_benchmark, arm_compute_lib)
@@ -181,13 +117,13 @@ if old_validation_env['benchmark_tests']:
     Default(arm_compute_benchmark)
     Export('arm_compute_benchmark')
 
-if old_validation_env['validation_tests']:
-    arm_compute_validation_new = test_env.Program('arm_compute_validation_new', files_validation + common_objects)
-    Depends(arm_compute_validation_new, arm_compute_test_framework)
-    Depends(arm_compute_validation_new, arm_compute_lib)
+if test_env['validation_tests']:
+    arm_compute_validation = test_env.Program('arm_compute_validation', files_validation + common_objects)
+    Depends(arm_compute_validation, arm_compute_test_framework)
+    Depends(arm_compute_validation, arm_compute_lib)
 
     if env['opencl']:
-        Depends(arm_compute_validation_new, opencl)
+        Depends(arm_compute_validation, opencl)
 
-    Default(arm_compute_validation_new)
-    Export('arm_compute_validation_new')
+    Default(arm_compute_validation)
+    Export('arm_compute_validation')