Merge pull request #7472 from keszybz/tests-on-a-slow-disk

Tests on a slow disk
2017-11-26 18:37:00 +01:00 · 2017-11-26 18:37:00 +01:00 · c8ace1bf5d
parent 97e7fb39a8 3113b5aca0
commit c8ace1bf5d
2 changed files with 4 additions and 2 deletions
--- 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,
--- 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