diff options
| author | Sidath Senanayake <sidaths@google.com> | 2018-09-27 14:34:14 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2018-09-27 14:34:14 +0200 |
| commit | f10b3de5283d0c196459f18160161e48cfadae81 (patch) | |
| tree | 7123dda75768c8b90b15c58523a7509a7c93a35b /mali_kbase/tests | |
| parent | f32af5a9ba3c2b556d92827a96dbeec3df200968 (diff) | |
| download | gpu-f10b3de5283d0c196459f18160161e48cfadae81.tar.gz | |
Mali Bifrost DDK r15p0 KMD
Provenance:
c4c373c4f (collaborate/EAC/b_r15p0)
BX304L01B-BU-00000-r15p0-01rel0
BX304L06A-BU-00000-r15p0-01rel0
BX304X07X-BU-00000-r15p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I09fe49ca693dfde616dd8d6b8c3e5b178a47e9f8
Diffstat (limited to 'mali_kbase/tests')
| -rw-r--r-- | mali_kbase/tests/build.bp | 14 | ||||
| -rw-r--r-- | mali_kbase/tests/kutf/kutf_suite.c | 4 | ||||
| -rw-r--r-- | mali_kbase/tests/kutf/sconscript | 4 | ||||
| -rw-r--r-- | mali_kbase/tests/mali_kutf_irq_test/sconscript | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/mali_kbase/tests/build.bp b/mali_kbase/tests/build.bp index 3107062..a0823c7 100644 --- a/mali_kbase/tests/build.bp +++ b/mali_kbase/tests/build.bp @@ -20,17 +20,3 @@ bob_defaults { "kernel/drivers/gpu/arm/midgard/tests/include", ], } - -subdirs = [ - "kutf", - "mali_kutf_irq_test", -] - -optional_subdirs = [ - "kutf_test", - "kutf_test_runner", - "mali_kutf_ipa_test", - "mali_kutf_ipa_unit_test", - "mali_kutf_vinstr_test", - "mali_kutf_fw_test", -] diff --git a/mali_kbase/tests/kutf/kutf_suite.c b/mali_kbase/tests/kutf/kutf_suite.c index 1c350bb..f3a8e9b 100644 --- a/mali_kbase/tests/kutf/kutf_suite.c +++ b/mali_kbase/tests/kutf/kutf_suite.c @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2014, 2017 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2014, 2017-2018 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -242,8 +242,6 @@ static void kutf_add_explicit_result(struct kutf_context *context) { switch (context->expected_status) { case KUTF_RESULT_UNKNOWN: - if (context->status == KUTF_RESULT_UNKNOWN) - kutf_test_pass(context, "(implicit pass)"); break; case KUTF_RESULT_WARN: diff --git a/mali_kbase/tests/kutf/sconscript b/mali_kbase/tests/kutf/sconscript index 98f6446..4590d1a 100644 --- a/mali_kbase/tests/kutf/sconscript +++ b/mali_kbase/tests/kutf/sconscript @@ -1,5 +1,5 @@ # -# (C) COPYRIGHT 2014-2016, 2017 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2014-2018 ARM Limited. All rights reserved. # # This program is free software and is provided to you under the terms of the # GNU General Public License version 2 as published by the Free Software @@ -21,7 +21,7 @@ Import('kutf_env') -make_args = kutf_env.kernel_get_config_defines(ret_list = True) +make_args = kutf_env.kernel_get_config_defines(ret_list = True, extra_cflags = ['-DCONFIG_MALI_KUTF'], extra_configs = ['CONFIG_MALI_KUTF=m']) mod = kutf_env.BuildKernelModule('$STATIC_LIB_PATH/kutf.ko', Glob('*.c'), make_args = make_args) kutf_env.KernelObjTarget('kutf', mod) diff --git a/mali_kbase/tests/mali_kutf_irq_test/sconscript b/mali_kbase/tests/mali_kutf_irq_test/sconscript index 76e3730..cefac0b 100644 --- a/mali_kbase/tests/mali_kutf_irq_test/sconscript +++ b/mali_kbase/tests/mali_kutf_irq_test/sconscript @@ -29,7 +29,7 @@ if env.GetOption('clean') : cmd = env.Command('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', src, []) env.KernelObjTarget('mali_kutf_irq_test', cmd) else: - makeAction=Action("cd ${SOURCE.dir} && make MALI_UNIT_TEST=${unit} MALI_CUSTOMER_RELEASE=${release} MALI_USE_CSF=${csf} %s && ( ( [ -f mali_kutf_irq_test.ko ] && cp mali_kutf_irq_test.ko $STATIC_LIB_PATH/ ) || touch $STATIC_LIB_PATH/mali_kutf_irq_test.ko)" % env.kernel_get_config_defines(), '$MAKECOMSTR') + makeAction=Action("cd ${SOURCE.dir} && make MALI_UNIT_TEST=${unit} MALI_CUSTOMER_RELEASE=${release} MALI_USE_CSF=${csf} %s && ( ( [ -f mali_kutf_irq_test.ko ] && cp mali_kutf_irq_test.ko $STATIC_LIB_PATH/ ) || touch $STATIC_LIB_PATH/mali_kutf_irq_test.ko)" % env.kernel_get_config_defines(extra_cflags = ['-DCONFIG_MALI_IRQ_LATENCY'], extra_configs = ['CONFIG_MALI_IRQ_LATENCY=m']), '$MAKECOMSTR') cmd = env.Command('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', src, [makeAction]) env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/kutf.ko') env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/mali_kbase.ko') |