From 6ea2a42bfe2bcc8745d2fcc567f9b9bd7c593834 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 19 Nov 2019 14:31:28 +0000 Subject: COMPMID-2939 Keep benchmark_examples and validate_examples Remove FIXME comments in Sconscripts referring to the removal of benchmark_examples and validate_examples, as we are keeping them in releases from now on. This is a 19.11 release activity ticket but the patch needs to be backported to master because this applies to all future releases. Signed-off-by: SiCong Li Change-Id: Ifac73ebeaf12c93d6309f73bb011bd275e1fe503 Reviewed-on: https://review.mlplatform.org/c/2334 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/SConscript | 3 --- tests/benchmark_examples/RunExample.cpp | 1 - tests/validate_examples/RunExample.cpp | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/SConscript b/tests/SConscript index a062cacaa5..663216906f 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -30,7 +30,6 @@ SConscript('./framework/SConscript', duplicate=0) # vars is imported from arm_compute: variables = [ - #FIXME: Remove before release! 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 @@ -161,7 +160,6 @@ if test_env['validation_tests']: Default(arm_compute_validation) Export('arm_compute_validation') - #FIXME: Remove before release! if test_env['validate_examples']: files_validate_examples = [ test_env.Object('validate_examples/RunExample.cpp') ] + [ x for x in common_objects if not "main.o" in str(x)] arm_compute_validate_examples = [] @@ -196,7 +194,6 @@ if test_env['validation_tests']: Default(arm_compute_validate_examples) Export('arm_compute_validate_examples') -#FIXME: Remove before release! if test_env['benchmark_examples']: files_benchmark_examples = test_env.Object('benchmark_examples/RunExample.cpp') graph_utils = test_env.Object(source="../utils/GraphUtils.cpp", target="GraphUtils") diff --git a/tests/benchmark_examples/RunExample.cpp b/tests/benchmark_examples/RunExample.cpp index a7a8be01cc..5c9dd7136e 100644 --- a/tests/benchmark_examples/RunExample.cpp +++ b/tests/benchmark_examples/RunExample.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "utils/Utils.h" -//FIXME / INTERNAL_ONLY: This file should not be released! #define BENCHMARK_EXAMPLES #include "utils/Utils.cpp" diff --git a/tests/validate_examples/RunExample.cpp b/tests/validate_examples/RunExample.cpp index 41ed85138e..f00460a643 100644 --- a/tests/validate_examples/RunExample.cpp +++ b/tests/validate_examples/RunExample.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "utils/Utils.h" -//FIXME / INTERNAL_ONLY: This file should not be released! #define BENCHMARK_EXAMPLES #include "utils/Utils.cpp" -- cgit v1.2.1