diff options
| author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2019-09-30 13:25:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2019-09-30 13:25:20 +0000 |
| commit | 3def86e983862dc17fd179c106d25611f03ab9d2 (patch) | |
| tree | 057e82d2763a1d8dc9bc979053bece85a901fa34 | |
| parent | d70d319d3809e38e0c6e42c40944aaf57ce26975 (diff) | |
| parent | d546a485ae7eb8c1147aeb79914d59593b993f34 (diff) | |
| download | crash-worker-3def86e983862dc17fd179c106d25611f03ab9d2.tar.gz crash-worker-3def86e983862dc17fd179c106d25611f03ab9d2.tar.bz2 crash-worker-3def86e983862dc17fd179c106d25611f03ab9d2.zip | |
Merge "Run all existing tests from tests/system/ directory" into tizen
| -rw-r--r-- | tests/system/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/system/run.sh.template | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/tests/system/CMakeLists.txt b/tests/system/CMakeLists.txt index 92796b6..767703e 100644 --- a/tests/system/CMakeLists.txt +++ b/tests/system/CMakeLists.txt @@ -2,16 +2,12 @@ cmake_minimum_required(VERSION 2.6) ADD_SUBDIRECTORY(utils) -set_property(GLOBAL PROPERTY TMP_TESTS_LIST "") - macro(CONFIGURE_TEST_FILE dir_name file_name) configure_file("${dir_name}/${file_name}.sh.template" "${dir_name}/${file_name}.sh" @ONLY) INSTALL(DIRECTORY ${dir_name}/ DESTINATION ${CRASH_SYSTEM_TESTS_PATH}/${dir_name} FILES_MATCHING PATTERN "*sh") endmacro() macro(CONFIGURE_TEST test_name) - set_property(GLOBAL APPEND_STRING PROPERTY TMP_TESTS_LIST "\"${test_name}\" ") - set(FILES_LIST ${test_name}) list(APPEND FILES_LIST ${ARGN}) @@ -42,7 +38,5 @@ configure_test("dbus_notify") configure_test("output_param") configure_test("libcrash-service") -get_property(TESTS_LIST GLOBAL PROPERTY TMP_TESTS_LIST) - configure_file("run.sh.template" "run.sh" @ONLY) INSTALL(FILES run.sh DESTINATION ${CRASH_SYSTEM_TESTS_PATH}) diff --git a/tests/system/run.sh.template b/tests/system/run.sh.template index d06754d..6e37c2f 100644 --- a/tests/system/run.sh.template +++ b/tests/system/run.sh.template @@ -1,7 +1,5 @@ #!/bin/bash -TESTS=(@TESTS_LIST@) - if [ -z "${CRASH_WORKER_SYSTEM_TESTS}" ]; then CRASH_WORKER_SYSTEM_TESTS="@CRASH_SYSTEM_TESTS_PATH@" fi @@ -15,7 +13,7 @@ function run_test { GREEN="\033[0;32m" YELLOW="\033[1;33m" NORMAL="\033[0m" - + TEST=${1} echo -ne "${TEST}:\t" echo "===================================" >> ${LOG_FILE} echo "Test ${TEST}:" >> ${LOG_FILE} @@ -40,6 +38,11 @@ function run_test { if [ -f ${LOG_FILE} ]; then rm ${LOG_FILE} fi -for TEST in ${TESTS[@]}; do - run_test ${TEST} + +for DIR in ${CRASH_WORKER_SYSTEM_TESTS}/*/; do + test_name=`basename ${DIR}` + + if [ -x ${CRASH_WORKER_SYSTEM_TESTS}/${test_name}/${test_name}.sh ]; then + run_test ${test_name} + fi done |