From: Holger Hans Peter Freyther hol...@moiji-mobile.com
* 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 -DCATALOG_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.
---
.travis.yml | 5 +++--
Makefile.am | 13 +++--
src/journal/test-catalog.c | 20 +---
src/journal/test-journal-interleaving.c | 4
src/journal/test-journal-stream.c | 4
src/journal/test-journal-verify.c | 4
src/journal/test-journal.c | 4
src/test/test-cgroup-util.c | 5 +++--
src/test/test-helper.h | 31 +++
src/test/test-id128.c | 11 +++
src/test/test-unit-file.c | 3 ++-
src/test/test-unit-name.c | 5 -
src/test/test-util.c| 9 +++--
13 files changed, 101 insertions(+), 17 deletions(-)
create mode 100644 src/test/test-helper.h
diff --git a/.travis.yml b/.travis.yml
index 42433fd..7e5251c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ compiler:
- gcc
before_install:
- sudo apt-get update -qq
- - sudo apt-get install autotools-dev automake autoconf libtool libdbus-1-dev
libcap-dev libblkid-dev libpam-dev libcryptsetup-dev libaudit-dev libacl1-dev
libattr1-dev libselinux-dev liblzma-dev libgcrypt-dev libqrencode-dev
libmicrohttpd-dev gtk-doc-tools gperf
-script: ./autogen.sh ./configure --enable-gtk-doc --enable-gtk-doc-pdf
make V=1 make dist V=1
+ - sudo apt-get install autotools-dev automake autoconf libtool libdbus-1-dev
libcap-dev libblkid-dev libpam-dev libcryptsetup-dev libaudit-dev libacl1-dev
libattr1-dev libselinux-dev liblzma-dev libgcrypt-dev libqrencode-dev
libmicrohttpd-dev gtk-doc-tools gperf python2.7-dev
+script: ./autogen.sh ./configure --enable-gtk-doc --enable-gtk-doc-pdf
make V=1 sudo ./systemd-machine-id-setup make check make distcheck
+after_failure: cat test-suite.log
notifications:
irc:
channels:
diff --git a/Makefile.am b/Makefile.am
index c4b9b1a..e598585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1130,6 +1130,9 @@ EXTRA_DIST += \
test/sched_rr_ok.service \
test/sched_rr_change.service
+EXTRA_DIST += \
+ src/test/test-helper.h
+
test_engine_SOURCES = \
src/test/test-engine.c
@@ -1328,7 +1331,8 @@ test_cgroup_util_SOURCES = \
test_cgroup_util_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon.la
test_env_replace_SOURCES = \
src/test/test-env-replace.c
@@ -2647,7 +2651,8 @@ test_id128_SOURCES = \
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la
tests += \
test-id128
@@ -2810,6 +2815,10 @@ test_mmap_cache_LDADD = \
test_catalog_SOURCES = \
src/journal/test-catalog.c
+test_catalog_CFLAGS = \
+ $(AM_CFLAGS) \
+ -DSTR(s)=\#s -DCATALOG_DIR=STR($(abs_top_srcdir)/catalog)
+
test_catalog_LDADD = \
libsystemd-shared.la \
libsystemd-label.la \
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 987867f..5db5bed 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -31,6 +31,16 @@
#include sd-messages.h
#include catalog.h
+static const char *catalog_dirs[] = {
+CATALOG_DIR,
+NULL,
+};
+
+static const char *no_catalog_dirs[] = {
+/bin/hopefully/with/no/catalog,
+NULL
+};
+
static void test_import(Hashmap *h, struct strbuf *sb,
const char* contents, ssize_t size, int code) {
int r;
@@ -100,9 +110,13 @@ static void test_catalog_update(void) {
r = catalog_update(database, NULL, NULL);
assert(r = 0);
-/* Note: this might actually not find anything, if systemd was
- * not installed before. That should be fine too. */
-r = catalog_update(database, NULL, catalog_file_dirs);
+/* Test what happens if there are no files in the directory. */
+r = catalog_update(database, NULL, no_catalog_dirs);
+assert(r = 0);
+
+/* Make sure that we at least have some files loaded or the
+ catalog_list below will fail. */
+r = catalog_update(database, NULL, catalog_dirs);
assert(r = 0);
}
diff --git a/src/journal/test-journal-interleaving.c
