Merge branch 'nether' into tizen

[platform/core/test/security-tests.git] / src / security-tests.sh

diff --git a/src/security-tests.sh b/src/security-tests.sh
index abb898b..1cf60b6 100644 (file)
--- a/src/security-tests.sh
+++ b/src/security-tests.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #####################################################################
-# Copyright (c) 2012-2014 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2012 - 2019 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -28,18 +28,6 @@ case $1 in
     echo
     libsmack-test "${@:2}" # propagate all remaining arguments (except first)
     ;;
-"smack-dbus")
-    echo "========================================================================="
-    echo "SMACK DBUS TEST"
-    echo
-    smack-dbus-tests "${@:2}"
-    ;;
-"libprivilege-control")
-    echo "========================================================================="
-    echo $1
-    echo
-    libprivilege-control-test "${@:2}"
-    ;;
 "security-manager")
     echo "========================================================================="
     echo "SECURITY MANAGER TESTS"
@@ -54,17 +42,31 @@ case $1 in
     ;;
 "ckm")
     echo "========================================================================="
-    echo "KEY MANAGER TESTS"
+    echo "KEY MANAGER UNPRIVILEGED TESTS"
+    echo
+    su - owner -c "ckm-tests ${@:2}"
+    echo "========================================================================="
+    echo "KEY MANAGER PRIVILEGED TESTS"
+    echo
+    ckm-privileged-tests "${@:2}"
+    ;;
+"yaca")
+    echo "========================================================================="
+    echo "YACA TESTS"
+    echo
+    yaca-test "${@:2}"
+    ;;
+"nether")
+    echo "========================================================================="
+    echo "NETHER TESTS"
     echo
-    ckm-tests "${@:2}"
+    nether-tests "${@:2}"
     ;;
 *)
     echo "Correct using:"
     echo "    security_test.sh <module> <args_for_module>"
     echo
-    echo "modules: smack, smack-dbus, libprivilege-control, ss-clientsmack"
-    echo "         ss-server, ss-api-speed, ss-password, ss-stress"
-    echo "         ss-privilege, security-manager, cynara, ckm"
+    echo "modules: smack, security-manager, cynara, ckm, yaca, nether"
     ;;
 
 esac