diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-07-18 08:30:06 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-08-22 00:52:14 -0400 |
| commit | 143bfdaf0b890fa7acadf02d1eafacaef1b696bd (patch) | |
| tree | 5a640d40bc7489c5933aac824f2bf23ecd2818ff /src/test/test-unit-file.c | |
| parent | 67ccd1c4b821b142ccd7b4bb292d9947aea8c581 (diff) | |
test: Make testing work on systems without or old systemd
* Introduce a macro to conditionally execute tests. This avoids
skipping the entire test if some parts require systemd
* Skip the journal tests when no /etc/machine-id is present
* Change test-catalog to load the catalog from the source directory
of systemd.
* /proc/PID/comm got introduced in v2.6.33 but travis is still
using v2.6.32.
* Enable make check and make distcheck on the travis build
* Use -D"CATALOG_DIR=STR($(abs_top_srcdir)/catalog)" as a STRINGIY
would result in the path '/home/ich/source/linux' to be expanded
to '/home/ich/source/1' as linux is defined to 1.
Diffstat (limited to 'src/test/test-unit-file.c')
| -rw-r--r-- | src/test/test-unit-file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 2075e86115..dc6bc55244 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -35,6 +35,7 @@ #include "load-fragment.h" #include "strv.h" #include "fileio.h" +#include "test-helper.h" static int test_unit_file_get_set(void) { int r; @@ -366,7 +367,7 @@ int main(int argc, char *argv[]) { test_load_env_file_2(); test_load_env_file_3(); test_load_env_file_4(); - test_install_printf(); + TEST_REQ_RUNNING_SYSTEMD(test_install_printf()); return r; } |