From 9fb0cac961f70d1937c5fa3eafeaee1385c89768 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 20 Apr 2018 15:46:21 +0100 Subject: COMPMID-1081: Introduced test-wide instruments Change-Id: I5831241f3fc503717cc51136453c2bf96d4b420b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128484 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- tests/SConscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/SConscript') diff --git a/tests/SConscript b/tests/SConscript index 20095e56fb..7aa4d9391f 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -158,7 +158,7 @@ if test_env['validation_tests']: cl_examples += [ test_env.Program(example, [ test_env.Object(source=file, target=example) ] + files_validate_examples, LIBS = test_env["LIBS"]) ] arm_compute_validate_examples += cl_examples if test_env['opencl'] and test_env['neon']: - if env['os'] == 'android': + if env['os'] in ['android', 'bare_metal'] or env['standalone']: Import('arm_compute_graph_a') graph_dependency = [ arm_compute_graph_a] else: @@ -168,7 +168,7 @@ if test_env['validation_tests']: graph_utils = test_env.Object(source="../utils/GraphUtils.cpp", target="GraphUtils") for file in Glob("validate_examples/graph_*.cpp"): example = "validate_" + os.path.basename(os.path.splitext(str(file))[0]) - if env['os'] == 'android': + if env['os'] in ['android', 'bare_metal'] or env['standalone']: prog = test_env.Program(example, [ test_env.Object(source=file, target=example), graph_utils]+ files_validate_examples, LIBS = test_env["LIBS"], LINKFLAGS=test_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) Depends(prog, graph_dependency) arm_compute_validate_examples += [ prog ] @@ -201,7 +201,7 @@ if test_env['benchmark_examples']: arm_compute_benchmark_examples += cl_examples # Graph examples - if env['os'] == 'android': + if env['os'] in ['android', 'bare_metal'] or env['standalone']: Import('arm_compute_graph_a') graph_dependency = [arm_compute_graph_a] else: @@ -210,7 +210,7 @@ if test_env['benchmark_examples']: graph_utils = test_env.Object(source="../utils/GraphUtils.cpp", target="GraphUtils") for file in Glob("../examples/graph_*.cpp"): example = "benchmark_" + os.path.basename(os.path.splitext(str(file))[0]) - if env['os'] == 'android': + if env['os'] in ['android', 'bare_metal'] or env['standalone']: prog = test_env.Program(example, [ test_env.Object(source=file, target=example), graph_utils]+ files_benchmark_examples, LIBS = test_env["LIBS"], LINKFLAGS=test_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) Depends(prog, [graph_dependency]) arm_compute_benchmark_examples += [ prog ] -- cgit v1.2.1