Move crash-worker tests to the /usr/libexec directory

Change-Id: Ib4daa77836316318e612740871e4de982d5357cd

diff --git a/packaging/crash-worker.manifest b/packaging/crash-worker.manifest
index 0b9ab26..e02ffc3 100644 (file)
--- a/packaging/crash-worker.manifest
+++ b/packaging/crash-worker.manifest
@@ -6,25 +6,25 @@
                <filesystem path="/usr/bin/dump_systemstate" label="System" exec_label="System"/>
                <filesystem path="/usr/bin/crash-manager" label="System" exec_label="System"/>
 
-               <filesystem path="/usr/lib/crash-worker/system-tests/full_core/full_core.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/check_minicore_mem/check_minicore_mem.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/check_minicore_mem/cp.sh" label="User::Shell" exec_label="System"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/cmp_backtraces/cmp_backtraces.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/cmp_backtraces/cp.sh" label="User::Shell" exec_label="System"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/critical_process/critical_process.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/time_test/time_test.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/time_test/cp.sh" label="User::Shell" exec_label="System"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/wait_for_opt_usr/wait_for_opt_usr.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/info_file/info_file.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/log_file/log_file.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/so_info_file/so_info_file.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/report_type_info/report_type_info.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/without_core/without_core.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/crash_root_path/crash_root_path.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/copy_tizen_manifest/copy_tizen_manifest.sh" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/utils/btee" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/utils/kenny" label="User::Shell" exec_label="User::Shell"/>
-               <filesystem path="/usr/lib/crash-worker/system-tests/utils/minicore-utils.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/full_core/full_core.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/check_minicore_mem/check_minicore_mem.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/check_minicore_mem/cp.sh" label="User::Shell" exec_label="System"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/cmp_backtraces/cmp_backtraces.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/cmp_backtraces/cp.sh" label="User::Shell" exec_label="System"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/critical_process/critical_process.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/time_test/time_test.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/time_test/cp.sh" label="User::Shell" exec_label="System"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/wait_for_opt_usr/wait_for_opt_usr.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/info_file/info_file.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/log_file/log_file.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/so_info_file/so_info_file.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/report_type_info/report_type_info.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/without_core/without_core.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/crash_root_path/crash_root_path.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/copy_tizen_manifest/copy_tizen_manifest.sh" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/utils/btee" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/utils/kenny" label="User::Shell" exec_label="User::Shell"/>
+               <filesystem path="/usr/libexec/crash-worker/system-tests/utils/minicore-utils.sh" label="User::Shell" exec_label="User::Shell"/>
                <filesystem path="/usr/bin/crash-worker-system-tests-run.sh" label="User::Shell" exec_label="User::Shell"/>
        </assign>
 </manifest>

diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index 04e71f1..2eb9e86 100644 (file)
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -142,8 +142,8 @@ export CFLAGS+=" -Werror"
           -DCRASH_STACK_BIN_PATH=%{_libexecdir}/crash-stack \
           -DCRASH_POPUP_BIN_PATH=%{_libexecdir}/crash-popup-launch \
           -DCRASH_NOTIFY_BIN_PATH=%{_libexecdir}/crash-notify-send \
-          -DCRASH_TESTS_PATH=%{_libdir}/crash-worker/tests \
-          -DCRASH_SYSTEM_TESTS_PATH=%{_libdir}/crash-worker/system-tests \
+          -DCRASH_TESTS_PATH=%{_libexecdir}/crash-worker/tests \
+          -DCRASH_SYSTEM_TESTS_PATH=%{_libexecdir}/crash-worker/system-tests \
           -DLIVEDUMPER=%{on_off livedumper} \
           -DCRASH_SERVICE=%{on_off crashservice} \
           -DUPGRADE_SCRIPT_PATH=%{upgrade_script_path} \
@@ -222,15 +222,15 @@ mkdir -p %{buildroot}%{crash_temp}
 %files tests
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{_libdir}/crash-worker/tests/test1-default-crash
-%{_libdir}/crash-worker/tests/test1-default-sleep
-%{_libdir}/crash-worker/tests/test1-default-ill
-%{_libdir}/crash-worker/tests/test1-custom-crash
-%{_libdir}/crash-worker/tests/test1-custom-sleep
-%{_libdir}/crash-worker/tests/test1-custom-ill
-%{_libdir}/crash-worker/tests/run_tests.sh
-%{_libdir}/crash-worker/tests/tests_common.sh
-%{_libdir}/crash-worker/tests/crash_common.sh
+%{_libexecdir}/crash-worker/tests/test1-default-crash
+%{_libexecdir}/crash-worker/tests/test1-default-sleep
+%{_libexecdir}/crash-worker/tests/test1-default-ill
+%{_libexecdir}/crash-worker/tests/test1-custom-crash
+%{_libexecdir}/crash-worker/tests/test1-custom-sleep
+%{_libexecdir}/crash-worker/tests/test1-custom-ill
+%{_libexecdir}/crash-worker/tests/run_tests.sh
+%{_libexecdir}/crash-worker/tests/tests_common.sh
+%{_libexecdir}/crash-worker/tests/crash_common.sh
 
 %endif
 
@@ -244,38 +244,38 @@ mkdir -p %{buildroot}%{crash_temp}
 %manifest %{name}.manifest
 %{_bindir}/crash-worker-system-tests-run
 
-%{_libdir}/crash-worker/system-tests/check_minicore_mem/check_minicore_mem.sh
-%{_libdir}/crash-worker/system-tests/check_minicore_mem/cp.sh
-%{_libdir}/crash-worker/system-tests/clean_temp/clean_temp.sh
-%{_libdir}/crash-worker/system-tests/cmp_backtraces/cmp_backtraces.sh
-%{_libdir}/crash-worker/system-tests/cmp_backtraces/cp.sh
-%{_libdir}/crash-worker/system-tests/copy_tizen_manifest/copy_tizen_manifest.sh
-%{_libdir}/crash-worker/system-tests/crash_root_path/crash_root_path.sh
-%{_libdir}/crash-worker/system-tests/critical_process/critical_process.sh
-%{_libdir}/crash-worker/system-tests/dbus_notify/dbus_notify.sh
-%{_libdir}/crash-worker/system-tests/dbus_notify_legacy/dbus_notify_legacy.sh
-%{_libdir}/crash-worker/system-tests/dump_systemstate_extras/dump_systemstate_extras.sh
-%{_libdir}/crash-worker/system-tests/exclude_paths/exclude_paths.sh
-%{_libdir}/crash-worker/system-tests/extra_script/extra_script.sh
-%{_libdir}/crash-worker/system-tests/full_core/full_core.sh
-%{_libdir}/crash-worker/system-tests/info_file/info_file.sh
-%{_libdir}/crash-worker/system-tests/libcrash-service/libcrash-service.sh
-%{_libdir}/crash-worker/system-tests/log_file/log_file.sh
-%{_libdir}/crash-worker/system-tests/output_param/output_param.sh
-%{_libdir}/crash-worker/system-tests/report_basic/report_basic.sh
-%{_libdir}/crash-worker/system-tests/report_type_info/report_type_info.sh
-%{_libdir}/crash-worker/system-tests/so_info_file/so_info_file.sh
-%{_libdir}/crash-worker/system-tests/temp_lock/temp_lock.sh
-%{_libdir}/crash-worker/system-tests/time_test/cp.sh
-%{_libdir}/crash-worker/system-tests/time_test/time_test.sh
-%{_libdir}/crash-worker/system-tests/utils/btee
-%{_libdir}/crash-worker/system-tests/utils/kenny
-%{_libdir}/crash-worker/system-tests/utils/libcrash-servicetest
-%{_libdir}/crash-worker/system-tests/utils/minicore-utils.sh
-%{_libdir}/crash-worker/system-tests/wait_for_opt_usr/wait_for_opt_usr.sh
-%{_libdir}/crash-worker/system-tests/without_so_info_file/without_so_info_file.sh
-%{_libdir}/crash-worker/system-tests/without_core/without_core.sh
+%{_libexecdir}/crash-worker/system-tests/check_minicore_mem/check_minicore_mem.sh
+%{_libexecdir}/crash-worker/system-tests/check_minicore_mem/cp.sh
+%{_libexecdir}/crash-worker/system-tests/clean_temp/clean_temp.sh
+%{_libexecdir}/crash-worker/system-tests/cmp_backtraces/cmp_backtraces.sh
+%{_libexecdir}/crash-worker/system-tests/cmp_backtraces/cp.sh
+%{_libexecdir}/crash-worker/system-tests/copy_tizen_manifest/copy_tizen_manifest.sh
+%{_libexecdir}/crash-worker/system-tests/crash_root_path/crash_root_path.sh
+%{_libexecdir}/crash-worker/system-tests/critical_process/critical_process.sh
+%{_libexecdir}/crash-worker/system-tests/dbus_notify/dbus_notify.sh
+%{_libexecdir}/crash-worker/system-tests/dbus_notify_legacy/dbus_notify_legacy.sh
+%{_libexecdir}/crash-worker/system-tests/dump_systemstate_extras/dump_systemstate_extras.sh
+%{_libexecdir}/crash-worker/system-tests/exclude_paths/exclude_paths.sh
+%{_libexecdir}/crash-worker/system-tests/extra_script/extra_script.sh
+%{_libexecdir}/crash-worker/system-tests/full_core/full_core.sh
+%{_libexecdir}/crash-worker/system-tests/info_file/info_file.sh
+%{_libexecdir}/crash-worker/system-tests/libcrash-service/libcrash-service.sh
+%{_libexecdir}/crash-worker/system-tests/log_file/log_file.sh
+%{_libexecdir}/crash-worker/system-tests/output_param/output_param.sh
+%{_libexecdir}/crash-worker/system-tests/report_basic/report_basic.sh
+%{_libexecdir}/crash-worker/system-tests/report_type_info/report_type_info.sh
+%{_libexecdir}/crash-worker/system-tests/so_info_file/so_info_file.sh
+%{_libexecdir}/crash-worker/system-tests/temp_lock/temp_lock.sh
+%{_libexecdir}/crash-worker/system-tests/time_test/cp.sh
+%{_libexecdir}/crash-worker/system-tests/time_test/time_test.sh
+%{_libexecdir}/crash-worker/system-tests/utils/btee
+%{_libexecdir}/crash-worker/system-tests/utils/kenny
+%{_libexecdir}/crash-worker/system-tests/utils/libcrash-servicetest
+%{_libexecdir}/crash-worker/system-tests/utils/minicore-utils.sh
+%{_libexecdir}/crash-worker/system-tests/wait_for_opt_usr/wait_for_opt_usr.sh
+%{_libexecdir}/crash-worker/system-tests/without_so_info_file/without_so_info_file.sh
+%{_libexecdir}/crash-worker/system-tests/without_core/without_core.sh
 
 %if %{with livedumper}
-%{_libdir}/crash-worker/system-tests/livedumper/livedumper.sh
+%{_libexecdir}/crash-worker/system-tests/livedumper/livedumper.sh
 %endif

diff --git a/tests/system/info_file/info_file.sh.template b/tests/system/info_file/info_file.sh.template
index 12628e0..9da29c5 100644 (file)
--- a/tests/system/info_file/info_file.sh.template
+++ b/tests/system/info_file/info_file.sh.template
@@ -52,12 +52,12 @@ RESULT=$(cat ${CRASH_DUMP_PATH}/${REPORT_DIR}/${REPORT_DIR}.info | sed -n '/Maps
 
 check "${CRASH_WORKER_SYSTEM_TESTS}/utils/kenny"
 check '[heap]'
-check '/usr/lib/libm-.*.so'
-check '/usr/lib/libc-.*.so'
-check '/usr/lib/libgcc_s.so'
-check '/usr/lib/libstdc++.*so'
-check '/usr/lib/libpthread-.*.so'
-check '/usr/lib/ld-.*.so'
+check '/usr/lib.*/libm-.*.so'
+check '/usr/lib.*/libc-.*.so'
+check '/usr/lib.*/libgcc_s.so'
+check '/usr/lib.*/libstdc++.*so'
+check '/usr/lib.*/libpthread-.*.so'
+check '/usr/lib.*/ld-.*.so'
 check '[stack]'
 
 RESULT=$(cat ${CRASH_DUMP_PATH}/${REPORT_DIR}/${REPORT_DIR}.info | sed -n '/Callstack Information/,/End of Call Stack/p')

diff --git a/tests/system/so_info_file/so_info_file.sh.template b/tests/system/so_info_file/so_info_file.sh.template
index 23cd7d9..4a4d34a 100644 (file)
--- a/tests/system/so_info_file/so_info_file.sh.template
+++ b/tests/system/so_info_file/so_info_file.sh.template
@@ -36,11 +36,11 @@ popd
 RESULT=$(cat ${CRASH_DUMP_PATH}/${REPORT_DIR}/${REPORT_DIR}.so_info)
 
 check "utils/kenny [a-z0-9]+ crash-worker-system-tests;[^;]+;[^;]+;[a-z0-9]+"
-check "/usr/lib/libm[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
-check "/usr/lib/libc[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
-check "/usr/lib/libgcc_s[^ ]+ [a-z0-9]+ libgcc;[^;]+;[^;]+;[a-z0-9]+"
-check "/usr/lib/libstdc[^ ]+ [a-z0-9]+ libstd[^;]+;[^;]+;[^;]+;[a-z0-9]+"
-check "/usr/lib/libpthread[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
-check "/usr/lib/ld[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
+check "/usr/lib.*/libm[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
+check "/usr/lib.*/libc[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
+check "/usr/lib.*/libgcc_s[^ ]+ [a-z0-9]+ libgcc;[^;]+;[^;]+;[a-z0-9]+"
+check "/usr/lib.*/libstdc[^ ]+ [a-z0-9]+ libstd[^;]+;[^;]+;[^;]+;[a-z0-9]+"
+check "/usr/lib.*/libpthread[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
+check "/usr/lib.*/ld[^ ]+ [a-z0-9]+ glibc;[^;]+;[^;]+;[a-z0-9]+"
 
 exit_ok

diff --git a/tests/system/without_core/without_core.sh.template b/tests/system/without_core/without_core.sh.template
index d1371e1..1d5b1d1 100644 (file)
--- a/tests/system/without_core/without_core.sh.template
+++ b/tests/system/without_core/without_core.sh.template
@@ -44,12 +44,12 @@ check "MemTotal:"
 check "VmExe:"
 check "VmSwap:"
 check '[heap]'
-check '/usr/lib/libm-.*.so'
-check '/usr/lib/libc-.*.so'
-check '/usr/lib/libgcc_s.so'
-check '/usr/lib/libstdc++.*so'
-check '/usr/lib/libpthread-.*.so'
-check '/usr/lib/ld-.*.so'
+check '/usr/lib.*/libm-.*.so'
+check '/usr/lib.*/libc-.*.so'
+check '/usr/lib.*/libgcc_s.so'
+check '/usr/lib.*/libstdc++.*so'
+check '/usr/lib.*/libpthread-.*.so'
+check '/usr/lib.*/ld-.*.so'
 check '[stack]'
 check 'main.*kenny'