diff options
| author | SiCong Li <sicong.li@arm.com> | 2019-11-20 14:11:32 +0000 |
|---|---|---|
| committer | SiCong Li <sicong.li@arm.com> | 2019-11-22 15:04:21 +0000 |
| commit | d352d953743196ae80afa780de8c97da3c1f2d5d (patch) | |
| tree | 9532a09d403b0b4f5f094be488fc3fbdb366a950 | |
| parent | bdea9643a2e5172710db652467c308152c81de32 (diff) | |
| download | ComputeLibrary-d352d953743196ae80afa780de8c97da3c1f2d5d.tar.gz | |
COMPMID-2916 Remove internal only build options
Signed-off-by: SiCong Li <sicong.li@arm.com>
Change-Id: I78f860926e76a7c297c5e78fabab2984c034c978
Reviewed-on: https://review.mlplatform.org/c/2329
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Georgios Pinitas <georgios.pinitas@arm.com>
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | tests/SConscript | 16 |
2 files changed, 0 insertions, 18 deletions
diff --git a/SConstruct b/SConstruct index 8509fedbb3..c0cf6d6393 100644 --- a/SConstruct +++ b/SConstruct @@ -57,8 +57,6 @@ vars.AddVariables( PathVariable("build_dir", "Specify sub-folder for the build", ".", PathVariable.PathAccept), PathVariable("install_dir", "Specify sub-folder for the install", "", PathVariable.PathAccept), BoolVariable("exceptions", "Enable/disable C++ exception support", True), - #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", ""), ("extra_cxx_flags", "Extra CXX flags to be appended to the build command", ""), ("extra_link_flags", "Extra LD flags to be appended to the build command", ""), diff --git a/tests/SConscript b/tests/SConscript index 663216906f..fe05185920 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -73,10 +73,6 @@ else: test_env.Append(LIBS = ["arm_compute_graph", "arm_compute", "arm_compute_core"]) arm_compute_lib = arm_compute_graph_so -#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'])]) @@ -84,9 +80,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') @@ -103,23 +96,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) files_validation += Glob('validation/NEON/' + filter_pattern) |