commit 6ea2a42bfe2bcc8745d2fcc567f9b9bd7c593834
author SiCong Li <sicong.li@arm.com> Tue Nov 19 14:31:28 2019 +0000
committer SiCong Li <sicong.li@arm.com> Thu Nov 21 13:22:35 2019 +0000
tree 20220030239b0d9068abd0e3eb6dc6b1555c2421
parent 3e84bb662f9c6c3f77837640b44c41b7e3403ed4

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 <sicong.li@arm.com>
Change-Id: Ifac73ebeaf12c93d6309f73bb011bd275e1fe503
Reviewed-on: https://review.mlplatform.org/c/2334
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

tests/SConscript

diff --git a/tests/SConscript b/tests/SConscript
index a062cac..6632169 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -30,7 +30,6 @@
 
 # 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 @@
     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 @@
         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")

tests/benchmark_examples/RunExample.cpp

diff --git a/tests/benchmark_examples/RunExample.cpp b/tests/benchmark_examples/RunExample.cpp
index a7a8be0..5c9dd71 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"

tests/validate_examples/RunExample.cpp

diff --git a/tests/validate_examples/RunExample.cpp b/tests/validate_examples/RunExample.cpp
index 41ed851..f00460a 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"