Fix new_service_test to parse correct lists

- SMACK label was not correctly filtered before.
- Fix grep command in the test script.

Change-Id: I5df41863d3067bc7a3b366f76a7cdaaa3cdcad60

diff --git a/test/new_service_test/check_new_service.sh b/test/new_service_test/check_new_service.sh
index 16461e0d7fc8d7ca8bc5f60c3af169094e4a8805..275fe66eb9429fc7b59a8ff751400196a3b5f8c7 100644 (file)
--- a/test/new_service_test/check_new_service.sh
+++ b/test/new_service_test/check_new_service.sh
@@ -29,7 +29,7 @@ function find_service
        do
                uid=";$(cat $line | grep "User=" | grep -v "#" | cut -d "=" -f2)"
                gid=";$(cat $line | grep "Group=" | grep -v "#" | cut -d "=" -f2)"
-               smacklabel=";$(cat $line | grep "SmackProcessLabel=" | grep -v "#" | cut -d "=" -f2)"
+               smacklabel=";$(cat $line | grep "SmackProcessLabel=" | grep -v "#" | cut -d "=" -f2);"
 
                check_service $line $uid $gid $smacklabel $2
        done

diff --git a/test/new_service_test/dbus_service.list b/test/new_service_test/dbus_service.list
index d10f1104484131cd3ad4488642065fdbc02f1a24..1bbd77738a67a66ea0fcaf91d90ea4671630a58c 100755 (executable)
--- a/test/new_service_test/dbus_service.list
+++ b/test/new_service_test/dbus_service.list
@@ -1,38 +1,38 @@
-net.asp.service;network_fw;network_fw;
-net.connman.service;network_fw;network_fw;
-net.connman.vpn.service;network_fw;network_fw;
-net.netconfig.service;network_fw;network_fw;
-net.stc.service;root;;
-net.wifidirect.service;network_fw;network_fw;
-org.O1.SecurityAccounts.gUserManagement.service;root;;
-org.bluez.ag_agent.service;network_fw;network_fw;
-org.bluez.hf_agent.service;root;;
-org.bluez.map_agent.service;network_fw;network_fw;
-org.bluez.obex.service;network_fw;network_fw;
-org.bluez.pb_agent.service;;;
-org.freedesktop.hostname1.service;root;;
-org.freedesktop.locale1.service;root;;
-org.freedesktop.login1.service;root;;
-org.freedesktop.systemd1.service;root;;
-org.projectx.bt.service;root;;
-org.projectx.bt_core.service;root;;
-org.tizen.MobileapAgent.service;network_fw;network_fw;
-org.tizen.PhonenumberUtils.dbus.service;service_fw;service_fw;
-org.tizen.SmartcardService.service;network_fw;network_fw;
-org.tizen.SoundServer.service;multimedia_fw;multimedia_fw;
-org.tizen.account.manager.service;;;
-org.tizen.alarm.manager.service;;;
-org.tizen.app2sd.service;root;;
-org.tizen.data-provider-master.service;app_fw;;
-org.tizen.dummyasm.service;service_fw;service_fw;
-org.tizen.fido-asm.service;service_fw;service_fw;
-org.tizen.fido.service;service_fw;service_fw;
-org.tizen.lbs.Providers.LbsServer.service;location;location;
-org.tizen.NetNfcService.service;network_fw;network_fw;
-org.tizen.pkg_recovery.service;;;
-org.tizen.pkgdir_tool.service;;;
-org.tizen.pkgmgr.service;;;
-org.tizen.scmirroring.server.service;multimedia_fw;multimedia_fw;
-org.tizen.smartreply.service;ui_fw;ui_fw;smartreply-service
-org.tizen.system.crash.service;root;root;
-org.tizen.system.popup.service;system_fw;system_fw;
+net.asp.service;network_fw;network_fw;;
+net.connman.service;network_fw;network_fw;;
+net.connman.vpn.service;network_fw;network_fw;;
+net.netconfig.service;network_fw;network_fw;;
+net.stc.service;root;;;
+net.wifidirect.service;network_fw;network_fw;;
+org.O1.SecurityAccounts.gUserManagement.service;root;;;
+org.bluez.ag_agent.service;network_fw;network_fw;;
+org.bluez.hf_agent.service;root;;;
+org.bluez.map_agent.service;network_fw;network_fw;;
+org.bluez.obex.service;network_fw;network_fw;;
+org.bluez.pb_agent.service;;;;
+org.freedesktop.hostname1.service;root;;;
+org.freedesktop.locale1.service;root;;;
+org.freedesktop.login1.service;root;;;
+org.freedesktop.systemd1.service;root;;;
+org.projectx.bt.service;root;;;
+org.projectx.bt_core.service;root;;;
+org.tizen.MobileapAgent.service;network_fw;network_fw;;
+org.tizen.PhonenumberUtils.dbus.service;service_fw;service_fw;;
+org.tizen.SmartcardService.service;network_fw;network_fw;;
+org.tizen.SoundServer.service;multimedia_fw;multimedia_fw;;
+org.tizen.account.manager.service;;;;
+org.tizen.alarm.manager.service;;;;
+org.tizen.app2sd.service;root;;;
+org.tizen.data-provider-master.service;app_fw;;;
+org.tizen.dummyasm.service;service_fw;service_fw;;
+org.tizen.fido-asm.service;service_fw;service_fw;;
+org.tizen.fido.service;service_fw;service_fw;;
+org.tizen.lbs.Providers.LbsServer.service;location;location;;
+org.tizen.NetNfcService.service;network_fw;network_fw;;
+org.tizen.pkg_recovery.service;;;;
+org.tizen.pkgdir_tool.service;;;;
+org.tizen.pkgmgr.service;;;;
+org.tizen.scmirroring.server.service;multimedia_fw;multimedia_fw;;
+org.tizen.smartreply.service;ui_fw;ui_fw;smartreply-service;
+org.tizen.system.crash.service;root;root;;
+org.tizen.system.popup.service;system_fw;system_fw;;

diff --git a/test/new_service_test/systemd_service.list b/test/new_service_test/systemd_service.list
index 96e2b0fde69c5025fdc9e180989bce2a4ff2302f..47df4ca5ab36e4ff82c3822cd3d7c1fee2958365 100755 (executable)
--- a/test/new_service_test/systemd_service.list
+++ b/test/new_service_test/systemd_service.list
@@ -1,155 +1,155 @@
-__user@.service;;;User
-ac.service;app_fw;app_fw;System
-accounts-service.service;service_fw;service_fw;System
-alarm-server.service;app_fw;app_fw;System
-app2sd-server.service;;;System
-askuser.service;security_fw;security_fw;
-auth-fw.service;security_fw;security_fw;System
-bluetooth-address.service;;;System
-bluetooth-force-hci-logger.service;network_fw;network_fw;System
-bluetooth-frwk.service;network_fw;network_fw;
-bluetooth-hci-device.service;;;System
-bluetooth-hci-dump@.service;network_fw;network_fw;System
-bluetooth-hci-logger.service;network_fw;network_fw;System
-bluetooth-hciattach@.service;;;System
-bluetooth-map-agent.service;network_fw;network_fw;
-bluetooth-pbap-agent.service;network_fw;network_fw;
-bluetooth-share.service;owner;users;User
-boot-animation.service;application;application;System
-browser-provider.service;web_fw;web_fw;System
-buxton2.service;buxton;buxton;System
-callmgr.service;telephony;telephony;System
-central-key-manager.service;key-manager;key-manager;System
-cert-checker.service;security_fw;security_fw;System
-cert-server.service;security_fw;security_fw;System
-connman-vpn.service;network_fw;network_fw;System
-connman.service;network_fw;network_fw;System
-console-getty.service;;;System
-console-shell.service;;;System
-container-getty@.service;;;System
-contextd.service;service_fw;service_fw;
-csr.service;security_fw;security_fw;System
-cynara.service;cynara;cynara;System
-data-provider-master.service;app_fw;app_fw;System
-dbus.service;dbus;dbus;System
-debug-shell.service;;;System
-device-policy-manager.service;security_fw;security_fw;System
-deviced.service;;;System::Privileged
-display-manager.service;;;System
-dlog_logger.service;;;System
-download-provider.service;web_fw;web_fw;System
-emergency.service;;;System
-emuld.service;;;System::Privileged
-emul-common-preinit.service;service_fw;service_fw;System
-emul-setup-audio-volume.service;service_fw;service_fw;System
-esd.service;app_fw;app_fw;System
-faultd.service;;;
-feedbackd.service;system_fw;system_fw;System
-fido-asm.service;service_fw;service_fw;
-fido-bt-roaming-agent.service;service_fw;service_fw;
-focus-server.service;multimedia_fw;multimedia_fw;System
-getty@.service;;;System
-gumd.service;;;System::Privileged
-init-update.service;;;
-initrd-cleanup.service;;;System
-initrd-parse-etc.service;;;System
-initrd-switch-root.service;;;System
-initrd-udevadm-cleanup-db.service;;;System
-kmod-static-nodes.service;;;System
-krate.service;;;System
-lazy_mount.service;;;System::Privileged
-lbs-server.service;location;location;System
-ldconfig.service;;;System
-license-manager-agent.service;security_fw;security_fw;System
-media-server.service;multimedia_fw;multimedia_fw;System
-mediacontroller.service;multimedia_fw;multimedia_fw;System
-mobileap-agent.service;network_fw;network_fw;System
-msg-server.service;messaging;messaging;System
-mtp-initiator.service;network_fw;network_fw;System
-mtp-responder.service;owner;users;System
-murphyd.service;multimedia_fw;multimedia_fw;System
-muse-server.service;multimedia_fw;multimedia_fw;System
-net-config.service;network_fw;network_fw;System
-nether.service;security_fw;security_fw;System
-nfc-manager.service;network_fw;network_fw;System
-obex.service;network_fw;network_fw;
-ode.service;;;System::Privileged
-offline-update.service;;;
-package-manager.service;app_fw;app_fw;System
-package-recovery.service;app_fw;app_fw;
-pass.service;system_fw;system_fw;System::Privileged
-phonenumber-utils.service;service_fw;service_fw;System
-pkg-db-recovery.service;app_fw;app_fw;System
-pkgdir-tool.service;app_fw;app_fw;System
-privacy-guard-server.service;security_fw;security_fw;System
-pulseaudio.service;;;System
-pushd.service;service_fw;service_fw;System
-quotaon.service;;;System
-rescue.service;;;System
-resize2fs@.service;;;System
-resourced.service;;;System::Privileged
-sdbd.service;sdk;sdk;System
-sdbd_tcp.service;;;System
-security-config.service;;;System::Privileged
-security-manager-cleanup.service;;;System::Privileged
-security-manager-rules-loader.service;;;System::Privileged
-security-manager.service;;;System::Privileged
-sensord.service;sensor;input;System
-serial-getty@.service;;;System
-shutdown-animation.service;application;application;System
-stc-manager.service;;;System
-storaged.service;;;System::Privileged
-sys-kernel-tracing.service;;;System
-systemd-ask-password-console.service;;;System
-systemd-ask-password-wall.service;;;System
-systemd-binfmt.service;;;System
-systemd-exit.service;;;
-systemd-fsck-root.service;;;System
-systemd-fsck@.service;;;System
-systemd-halt.service;;;System
-systemd-hibernate-resume@.service;;;System
-systemd-hibernate.service;;;System
-systemd-hostnamed.service;;;System
-systemd-hwdb-update.service;;;System
-systemd-hybrid-sleep.service;;;System
-systemd-initctl.service;;;System
-systemd-journal-catalog-update.service;;;System
-systemd-journal-flush.service;;;System
-systemd-journald.service;;;^
-systemd-kexec.service;;;System
-systemd-localed.service;;;System
-systemd-logind.service;;;System::Privileged
-systemd-machine-id-commit.service;;;System
-systemd-modules-load.service;;;System
-systemd-nspawn@.service;;;System
-systemd-poweroff.service;;;System
-systemd-quotacheck.service;;;System
-systemd-reboot.service;;;System
-systemd-remount-fs.service;;;System
-systemd-suspend.service;;;System
-systemd-sysctl.service;;;System
-systemd-tmpfiles-clean.service;;;System::Privileged
-systemd-tmpfiles-setup-dev.service;;;System::Privileged
-systemd-tmpfiles-setup.service;;;System::Privileged
-systemd-udev-settle.service;;;System
-systemd-udev-trigger.service;;;System
-systemd-udevd.service;;;System::Privileged
-systemd-update-done.service;;;System
-systemd-update-utmp-runlevel.service;;;System
-systemd-update-utmp.service;;;System
-systemd-user-sessions.service;;;System
-systemd-vconsole-setup.service;;;System
-telephony-daemon.service;telephony;telephony;System
-tizen-debug-off.service;;;System
-tizen-debug-on.service;;;System
-tizen-fstrim-user.service;;;System
-tizen-system-env.service;;;System
-tizenid.service;system_fw;system_fw;System
-tlm.service;;;System
-ttrace-marker.service;;;
-usb-host-ffs-test-daemon.service;;;
-user@.service;%i;;User
-__user@.service;%i;;User
-vmodem-x86.service;;;System::Privileged
-webappenc-initializer.service;security_fw;security_fw;System
-wifi-direct-manager.service;network_fw;network_fw;System
+__user@.service;;;User;
+ac.service;app_fw;app_fw;System;
+accounts-service.service;service_fw;service_fw;System;
+alarm-server.service;app_fw;app_fw;System;
+app2sd-server.service;;;System;
+askuser.service;security_fw;security_fw;;
+auth-fw.service;security_fw;security_fw;System;
+bluetooth-address.service;;;System;
+bluetooth-force-hci-logger.service;network_fw;network_fw;System;
+bluetooth-frwk.service;network_fw;network_fw;;
+bluetooth-hci-device.service;;;System;
+bluetooth-hci-dump@.service;network_fw;network_fw;System;
+bluetooth-hci-logger.service;network_fw;network_fw;System;
+bluetooth-hciattach@.service;;;System;
+bluetooth-map-agent.service;network_fw;network_fw;;
+bluetooth-pbap-agent.service;network_fw;network_fw;;
+bluetooth-share.service;owner;users;User;
+boot-animation.service;application;application;System;
+browser-provider.service;web_fw;web_fw;System;
+buxton2.service;buxton;buxton;System;
+callmgr.service;telephony;telephony;System;
+central-key-manager.service;key-manager;key-manager;System;
+cert-checker.service;security_fw;security_fw;System;
+cert-server.service;security_fw;security_fw;System;
+connman-vpn.service;network_fw;network_fw;System;
+connman.service;network_fw;network_fw;System;
+console-getty.service;;;System;
+console-shell.service;;;System;
+container-getty@.service;;;System;
+contextd.service;service_fw;service_fw;;
+csr.service;security_fw;security_fw;System;
+cynara.service;cynara;cynara;System;
+data-provider-master.service;app_fw;app_fw;System;
+dbus.service;dbus;dbus;System;
+debug-shell.service;;;System;
+device-policy-manager.service;security_fw;security_fw;System;
+deviced.service;;;System::Privileged;
+display-manager.service;;;System;
+dlog_logger.service;;;System;
+download-provider.service;web_fw;web_fw;System;
+emergency.service;;;System;
+emuld.service;;;System::Privileged;
+emul-common-preinit.service;service_fw;service_fw;System;
+emul-setup-audio-volume.service;service_fw;service_fw;System;
+esd.service;app_fw;app_fw;System;
+faultd.service;;;;
+feedbackd.service;system_fw;system_fw;System;
+fido-asm.service;service_fw;service_fw;;
+fido-bt-roaming-agent.service;service_fw;service_fw;;
+focus-server.service;multimedia_fw;multimedia_fw;System;
+getty@.service;;;System;
+gumd.service;;;System::Privileged;
+init-update.service;;;;
+initrd-cleanup.service;;;System;
+initrd-parse-etc.service;;;System;
+initrd-switch-root.service;;;System;
+initrd-udevadm-cleanup-db.service;;;System;
+kmod-static-nodes.service;;;System;
+krate.service;;;System;
+lazy_mount.service;;;System::Privileged;
+lbs-server.service;location;location;System;
+ldconfig.service;;;System;
+license-manager-agent.service;security_fw;security_fw;System;
+media-server.service;multimedia_fw;multimedia_fw;System;
+mediacontroller.service;multimedia_fw;multimedia_fw;System;
+mobileap-agent.service;network_fw;network_fw;System;
+msg-server.service;messaging;messaging;System;
+mtp-initiator.service;network_fw;network_fw;System;
+mtp-responder.service;owner;users;System;
+murphyd.service;multimedia_fw;multimedia_fw;System;
+muse-server.service;multimedia_fw;multimedia_fw;System;
+net-config.service;network_fw;network_fw;System;
+nether.service;security_fw;security_fw;System;
+nfc-manager.service;network_fw;network_fw;System;
+obex.service;network_fw;network_fw;;
+ode.service;;;System::Privileged;
+offline-update.service;;;;
+package-manager.service;app_fw;app_fw;System;
+package-recovery.service;app_fw;app_fw;;
+pass.service;system_fw;system_fw;System::Privileged;
+phonenumber-utils.service;service_fw;service_fw;System;
+pkg-db-recovery.service;app_fw;app_fw;System;
+pkgdir-tool.service;app_fw;app_fw;System;
+privacy-guard-server.service;security_fw;security_fw;System;
+pulseaudio.service;;;System;
+pushd.service;service_fw;service_fw;System;
+quotaon.service;;;System;
+rescue.service;;;System;
+resize2fs@.service;;;System;
+resourced.service;;;System::Privileged;
+sdbd.service;sdk;sdk;System;
+sdbd_tcp.service;;;System;
+security-config.service;;;System::Privileged;
+security-manager-cleanup.service;;;System::Privileged;
+security-manager-rules-loader.service;;;System::Privileged;
+security-manager.service;;;System::Privileged;
+sensord.service;sensor;input;System;
+serial-getty@.service;;;System;
+shutdown-animation.service;application;application;System;
+stc-manager.service;;;System;
+storaged.service;;;System::Privileged;
+sys-kernel-tracing.service;;;System;
+systemd-ask-password-console.service;;;System;
+systemd-ask-password-wall.service;;;System;
+systemd-binfmt.service;;;System;
+systemd-exit.service;;;;
+systemd-fsck-root.service;;;System;
+systemd-fsck@.service;;;System;
+systemd-halt.service;;;System;
+systemd-hibernate-resume@.service;;;System;
+systemd-hibernate.service;;;System;
+systemd-hostnamed.service;;;System;
+systemd-hwdb-update.service;;;System;
+systemd-hybrid-sleep.service;;;System;
+systemd-initctl.service;;;System;
+systemd-journal-catalog-update.service;;;System;
+systemd-journal-flush.service;;;System;
+systemd-journald.service;;;;
+systemd-kexec.service;;;System;
+systemd-localed.service;;;System;
+systemd-logind.service;;;System::Privileged;
+systemd-machine-id-commit.service;;;System;
+systemd-modules-load.service;;;System;
+systemd-nspawn@.service;;;System;
+systemd-poweroff.service;;;System;
+systemd-quotacheck.service;;;System;
+systemd-reboot.service;;;System;
+systemd-remount-fs.service;;;System;
+systemd-suspend.service;;;System;
+systemd-sysctl.service;;;System;
+systemd-tmpfiles-clean.service;;;System::Privileged;
+systemd-tmpfiles-setup-dev.service;;;System::Privileged;
+systemd-tmpfiles-setup.service;;;System::Privileged;
+systemd-udev-settle.service;;;System;
+systemd-udev-trigger.service;;;System;
+systemd-udevd.service;;;System::Privileged;
+systemd-update-done.service;;;System;
+systemd-update-utmp-runlevel.service;;;System;
+systemd-update-utmp.service;;;System;
+systemd-user-sessions.service;;;System;
+systemd-vconsole-setup.service;;;System;
+telephony-daemon.service;telephony;telephony;System;
+tizen-debug-off.service;;;System;
+tizen-debug-on.service;;;System;
+tizen-fstrim-user.service;;;System;
+tizen-system-env.service;;;System;
+tizenid.service;system_fw;system_fw;System;
+tlm.service;;;System;
+ttrace-marker.service;;;;
+usb-host-ffs-test-daemon.service;;;;
+user@.service;%i;;User;
+__user@.service;%i;;User;
+vmodem-x86.service;;;System::Privileged;
+webappenc-initializer.service;security_fw;security_fw;System;
+wifi-direct-manager.service;network_fw;network_fw;System;