diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-11-26 18:37:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-26 18:37:00 +0100 |
| commit | c8ace1bf5d8da858d5e5c2c49904eeaba34202e0 (patch) | |
| tree | ce6b1e80ef3e80a4da47d5ea10f2179e802f0420 | |
| parent | 97e7fb39a84468ef802a3d2ec19840eff27de211 (diff) | |
| parent | 3113b5aca09fdee94130709a391f330961c0cd04 (diff) | |
| download | systemd-c8ace1bf5d8da858d5e5c2c49904eeaba34202e0.tar.gz | |
Merge pull request #7472 from keszybz/tests-on-a-slow-disk
Tests on a slow disk
| -rw-r--r-- | src/test/meson.build | 3 | ||||
| -rw-r--r-- | test/meson.build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/meson.build b/src/test/meson.build index 0a43fd03d8..9a8d620bac 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -664,7 +664,8 @@ tests += [ libshared], [threads, libxz, - liblz4]], + liblz4], + '', 'timeout=360'], [['src/journal/test-journal-stream.c'], [libjournal_core, diff --git a/test/meson.build b/test/meson.build index 8f0c6ab909..33fa28e3c4 100644 --- a/test/meson.build +++ b/test/meson.build @@ -219,5 +219,6 @@ test('udev-test', if conf.get('ENABLE_HWDB') == 1 hwdb_test_sh = find_program('hwdb-test.sh') test('hwdb-test', - hwdb_test_sh) + hwdb_test_sh, + timeout : 90) endif |