diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-02-21 15:19:48 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-02-21 15:48:13 +0100 |
| commit | 17bef63abdd1c106be8e186998372063acc836d0 (patch) | |
| tree | 31c09579a9f6a256a2dec5b564ffa777b2b118b3 /test | |
| parent | 094a388e708ce6ec5a738586db0cbb2c3b761936 (diff) | |
Try to fix parallel build.
We are running make -j2 check with Jenkins now.
Which fails with these unit tests. Let's just
serialize all, so we can test cypress test
parallelization.
Change-Id: Ib1ed21581c88cd86cbd13ef5c6b8b98abaef1da5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89211
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 9146f2a83..e6588810c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -233,10 +233,8 @@ unit-copy-paste.log : unit-crash.log unit-typing.log : unit-copy-paste.log unit-convert.log : unit-typing.log unit-prefork.log : unit-convert.log - -# try a couple in parallel unit-tilecache.log : unit-prefork.log -unit-timeout.log : unit-prefork.log +unit-timeout.log : unit-tilecache.log unit-oauth.log : unit-timeout.log unit-wopi.log : unit-oauth.log @@ -247,9 +245,8 @@ unit-wopi-documentconflict.log : unit-wopi-versionrestore.log unit_wopi_renamefile.log : unit-wopi-documentconflict.log unit_wopi_watermark.log : unit_wopi_renamefile.log -# parallelize a couple at least. unit-http.log : unit_wopi_watermark.log -unit-tiff-load.log : unit_wopi_watermark.log +unit-tiff-load.log : unit-http.log unit-large-paste.log : unit-tiff-load.log unit-paste.log : unit-large-paste.log |