From 1e8f7e7055863b87c0d51c86384f957d38160ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Thu, 22 Jun 2023 16:39:49 +0200 Subject: [PATCH 1/2] test that `-pp` flags are correctly handled (see ocaml/ocaml-lsp#1153) --- tests/test-dirs/with-pp.t/run.t | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tests/test-dirs/with-pp.t/run.t diff --git a/tests/test-dirs/with-pp.t/run.t b/tests/test-dirs/with-pp.t/run.t new file mode 100644 index 0000000000..cf54448030 --- /dev/null +++ b/tests/test-dirs/with-pp.t/run.t @@ -0,0 +1,18 @@ + $ cat >pp.sh < #!/bin/sh + > sed 's/world/universe/g' \$1 + > EOF + + $ chmod a+x pp.sh + + $ cat >main.ml < type world!;; + > EOF + + $ cat >.merlin < FLG -pp pp.sh + > EOF + + $ $MERLIN single dump -what ppxed-source -filename main.ml tr -d '\n' | jq '.value' + "type universe" From 5d654400208d2ee6c558bb0a63e863a43d5d0487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Tue, 27 Jun 2023 17:23:28 +0200 Subject: [PATCH 2/2] Try to fix windows CI --- tests/test-dirs/with-pp.t/run.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-dirs/with-pp.t/run.t b/tests/test-dirs/with-pp.t/run.t index cf54448030..a9ad317525 100644 --- a/tests/test-dirs/with-pp.t/run.t +++ b/tests/test-dirs/with-pp.t/run.t @@ -10,7 +10,7 @@ > EOF $ cat >.merlin < FLG -pp pp.sh + > FLG -pp 'sh pp.sh' > EOF $ $MERLIN single dump -what ppxed-source -filename main.ml