diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-02-24 08:06:53 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-02-24 08:06:53 +0100 |
| commit | 77d9510adc57224946393ed4fdc4e0468e3b501d (patch) | |
| tree | f829241cb416a7d037d176eb2e2318c8ded2c964 | |
| parent | 3349f777518f607cea5a9473ed63676f7de70129 (diff) | |
| parent | bd3bc546204f29eeda39e6d3b7bf38cb844c5d19 (diff) | |
Merge pull request #2719 from evverx/add-test-to-makefile
tests: various fixes
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/test/test-execute.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 4c58522d0f..7bd98dddf6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1550,6 +1550,7 @@ EXTRA_DIST += \ test/test-execute/exec-privatedevices-yes.service \ test/test-execute/exec-privatetmp-no.service \ test/test-execute/exec-privatetmp-yes.service \ + test/test-execute/exec-spec-interpolation.service \ test/test-execute/exec-systemcallerrornumber.service \ test/test-execute/exec-systemcallfilter-failing2.service \ test/test-execute/exec-systemcallfilter-failing.service \ @@ -1571,6 +1572,11 @@ EXTRA_DIST += \ test/test-execute/exec-capabilityboundingset-merge.service \ test/test-execute/exec-capabilityboundingset-reset.service \ test/test-execute/exec-capabilityboundingset-simple.service \ + test/test-execute/exec-capabilityambientset.service \ + test/test-execute/exec-capabilityambientset-merge.service \ + test/test-execute/exec-runtimedirectory.service \ + test/test-execute/exec-runtimedirectory-mode.service \ + test/test-execute/exec-runtimedirectory-owner.service \ test/bus-policy/hello.conf \ test/bus-policy/methods.conf \ test/bus-policy/ownerships.conf \ diff --git a/src/test/test-execute.c b/src/test/test-execute.c index d021be4671..0d2e4bfc15 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -91,7 +91,7 @@ static void test_exec_personality(Manager *m) { #elif defined(__s390__) test(m, "exec-personality-s390.service", 0, CLD_EXITED); -#else +#elif defined(__i386__) test(m, "exec-personality-x86.service", 0, CLD_EXITED); #endif } |