Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[qtcontacts-sqlite] Don't use sticky bit for unit tests
This commit ensures that the unit tests are run in privileged mode
with blts-tools instead of installed with the sticky bit set.
  • Loading branch information
Chris Adams committed Apr 8, 2015
1 parent df20a88 commit 1cd0d4a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 1 addition & 0 deletions qtcontacts-sqlite.pro
Expand Up @@ -2,5 +2,6 @@ TEMPLATE = subdirs
SUBDIRS = \
src \
tests
OTHER_FILES += rpm/qtcontacts-sqlite-qt5.spec

tests.depends = src
5 changes: 0 additions & 5 deletions rpm/qtcontacts-sqlite-qt5.spec
Expand Up @@ -59,8 +59,3 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
%qmake5_install

%post tests
for n in tst_aggregation tst_qcontactmanager ; do
pathname=/opt/tests/qtcontacts-sqlite-qt5/$n
chgrp privileged $pathname && chmod g+s $pathname
done
4 changes: 2 additions & 2 deletions tests/tests.xml
Expand Up @@ -6,11 +6,11 @@
<description>Backend correctness automatic tests</description>
<case manual="false" name="aggregation">
<step>/usr/sbin/run-blts-root /bin/su -g privileged -c 'rm -rf /home/nemo/.local/share/system/privileged/Contacts/qtcontacts-sqlite-test' nemo</step>
<step>/opt/tests/qtcontacts-sqlite-qt5/tst_aggregation</step>
<step>/usr/sbin/run-blts-root /bin/su -g privileged -c '/opt/tests/qtcontacts-sqlite-qt5/tst_aggregation' nemo</step>
</case>
<case manual="false" name="contactmanager">
<step>/usr/sbin/run-blts-root /bin/su -g privileged -c 'rm -rf /home/nemo/.local/share/system/privileged/Contacts/qtcontacts-sqlite-test' nemo</step>
<step>/opt/tests/qtcontacts-sqlite-qt5/tst_qcontactmanager</step>
<step>/usr/sbin/run-blts-root /bin/su -g privileged -c '/opt/tests/qtcontacts-sqlite-qt5/tst_qcontactmanager' nemo</step>
</case>
<case manual="false" name="contactmanagerfiltering">
<step>rm -rf /home/nemo/.local/share/system/Contacts/qtcontacts-sqlite-test</step>
Expand Down

0 comments on commit 1cd0d4a

Please sign in to comment.