From d0f9d346d24279d2313282339bb14cbb560321ee Mon Sep 17 00:00:00 2001 From: Sacha Ayoun Date: Thu, 17 Feb 2022 16:14:13 +0000 Subject: [PATCH] Merge branch 'latex-doc' of https://github.com/giltho/dune into latex-doc Signed-off-by: Sacha Ayoun --- .../test-cases/directory-targets/copy-files.t | 6 +++--- test/expect-tests/fsevents/dune | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/blackbox-tests/test-cases/directory-targets/copy-files.t b/test/blackbox-tests/test-cases/directory-targets/copy-files.t index 53160f866a9..9883051baa3 100644 --- a/test/blackbox-tests/test-cases/directory-targets/copy-files.t +++ b/test/blackbox-tests/test-cases/directory-targets/copy-files.t @@ -48,6 +48,6 @@ Copy from a generated directory somewhere else Error: Cannot find directory: a/foo [1] - $ ls _build/default/b - ls: cannot access '_build/default/b': No such file or directory - [2] + $ dir="_build/default/b" + $ if [ -d $dir ]; then echo "$dir exists"; else echo "$dir does not exist"; fi + _build/default/b does not exist diff --git a/test/expect-tests/fsevents/dune b/test/expect-tests/fsevents/dune index 4d47a2307e7..0d79b74fa8f 100644 --- a/test/expect-tests/fsevents/dune +++ b/test/expect-tests/fsevents/dune @@ -2,7 +2,9 @@ (name fsevents_tests) (inline_tests (enabled_if - (= %{system} macosx)) + (and + (<> %{env:CI=false} true) + (= %{system} macosx))) (deps (sandbox always))) (libraries