From 405d43bd27a162bd2e9880ad5f37a46e4b3053c2 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Fri, 24 Mar 2023 00:32:26 +0100 Subject: [PATCH 1/3] Bump dune lang to 3.8 --- dune-project | 2 +- runner/lib/dune | 6 +++++- test/dune | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dune-project b/dune-project index eb10bcb..7d011e1 100644 --- a/dune-project +++ b/dune-project @@ -1 +1 @@ -(lang dune 1.10) \ No newline at end of file +(lang dune 3.8) \ No newline at end of file diff --git a/runner/lib/dune b/runner/lib/dune index 746f40a..0a77148 100644 --- a/runner/lib/dune +++ b/runner/lib/dune @@ -1,4 +1,8 @@ (library (name ppx_inline_test_runner_lib) (public_name ppx_inline_test.runner.lib) (js_of_ocaml (flags --no-sourcemap) (javascript_files runtime.js)) - (c_names am_testing) (libraries base) (preprocess no_preprocessing)) \ No newline at end of file + (foreign_stubs + (language c) + (names am_testing)) + (libraries base) + (preprocess no_preprocessing)) \ No newline at end of file diff --git a/test/dune b/test/dune index 93fdb2e..ca0646c 100644 --- a/test/dune +++ b/test/dune @@ -41,7 +41,7 @@ \n")) (mode fallback)) -(alias (name runtest) +(rule (alias runtest) (deps test.expected test.output test-inlining.expected test-inlining.output) (action (bash From ea315c4b40de993287a8aeb584bb61fa314678db Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 25 May 2023 15:22:29 +0200 Subject: [PATCH 2/3] inline test backend now uses partition --- src/dune | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dune b/src/dune index 859a093..4dcf3d1 100644 --- a/src/dune +++ b/src/dune @@ -5,5 +5,6 @@ (preprocess (pps ppxlib.metaquot)) (inline_tests.backend (runner_libraries ppx_inline_test.runner.lib) (generate_runner (echo "let () = Ppx_inline_test_lib.exit ();;")) - (flags "inline-test-runner" %{library-name} -source-tree-root + (list_partitions_flags "inline-test-runner" %{library-name} -list-partitions) + (flags "inline-test-runner" %{library-name} -partition %{partition} -source-tree-root %{workspace_root} -diff-cmd -))) \ No newline at end of file From ed0a2ad8b9f431b630e9c058bcf90ceeed668719 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 25 May 2023 15:23:59 +0200 Subject: [PATCH 3/3] bump dune version dep --- ppx_inline_test.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ppx_inline_test.opam b/ppx_inline_test.opam index 9058d17..897b4ed 100644 --- a/ppx_inline_test.opam +++ b/ppx_inline_test.opam @@ -13,7 +13,7 @@ depends: [ "ocaml" {>= "4.14.0"} "base" "time_now" - "dune" {>= "2.0.0"} + "dune" {>= "3.8.0"} "ppxlib" {>= "0.28.0"} ] available: arch != "arm32" & arch != "x86_32"