Move D-Bus tests from common/ to new dbus directory

D-Bus is a fairly major piece of Apertis infrastructure, so it seems
worth splitting out.

Also rename dbus.yaml (the upstream installed-tests) to
installed-tests.yaml, in preparation for adding other D-Bus tests.

Differential Revision: https://phabricator.apertis.org/D358
Reviewed-by: pwith

Makefile

@@ -27,6 +27,7 @@ SUBDIRS = \
 	clutter-transparent-stage/ \
 	clutter-zoom/ \
 	common/ \
+	dbus/ \
 	dbus-dos-match-rules/manual/ \
 	dbus-dos-reply-time/manual/ \
 	emulated-soft-keys/ \
@@ -66,6 +67,7 @@ COPY = \
 	apparmor/run-aa-test \
 	clutter \
 	common \
+	dbus \
 	folks \
 	misc \
 	predeployed-misc \

dbus/Makefile

+all:
+	:
+
+install:
+	:
+
+clean:
+	:

common/dbus.yaml → dbus/installed-tests.yaml

 metadata:
-  name: dbus
+  name: dbus-installed-tests
   format: "Lava-Test-Shell Test Definition 1.0"
   description: "Regression tests for D-Bus"
   maintainer: "simon.mcvittie@collabora.co.uk"
@@ -19,8 +19,8 @@ install:
 
 run:
   steps:
-  - common/run-test-in-systemd --user=user --name=as-user --timeout=15min common/dbus-installed-tests.sh
-  - common/run-test-in-systemd --name=as-root --timeout=15min common/dbus-installed-tests.sh
+  - common/run-test-in-systemd --user=user --name=as-user --timeout=15min dbus/installed-tests.sh
+  - common/run-test-in-systemd --name=as-root --timeout=15min dbus/installed-tests.sh
 
 parse:
   pattern: 'TEST_RESULT:(?P<result>\w+):(?P<test_case_id>[^:]+):'

debian/apertis-tests.install

@@ -4,6 +4,7 @@ usr/lib/apertis-tests/apparmor/folks
 usr/lib/apertis-tests/apparmor/run-aa-test
 usr/lib/apertis-tests/clutter
 usr/lib/apertis-tests/common
+usr/lib/apertis-tests/dbus
 usr/lib/apertis-tests/folks
 usr/lib/apertis-tests/misc
 usr/lib/apertis-tests/predeployed-misc

debian/changelog

+apertis-tests (1:0.20150814.2) UNRELEASED; urgency=medium
+
+  * Move D-Bus tests from common/ to dbus/
+
+ -- Simon McVittie <simon.mcvittie@collabora.co.uk>  Tue, 25 Aug 2015 11:35:18 +0100
+
 apertis-tests (1:0.20150814.1) 15.09; urgency=medium
 
   * run-aa-test: print exit status as soon as we know it

templates/group-common-tpl.json

@@ -138,7 +138,7 @@
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
             "revision": "master",
-            "testdef": "common/dbus.yaml"
+            "testdef": "dbus/installed-tests.yaml"
           }
         ]
       }
@@ -156,7 +156,7 @@
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
             "revision": "master",
-            "testdef": "common/dbus-dos-reply-time.yaml"
+            "testdef": "dbus/dos-reply-time.yaml"
           }
         ]
       }