Fix #3347

CHANGES.md

@@ -48,6 +48,9 @@ Unreleased
 - Add a `(subdir ..)` stanza to allow evaluating stanzas in sub directories.
   (#3268, @rgrinberg)
 
+- Fix a bug preventing one from running inline tests in multiple modes
+  (#3348, @diml)
+
 2.4.0 (06/03/2020)
 ------------------
 

src/dune/inline_tests.ml

@@ -334,7 +334,7 @@ include Sub_system.Register_end_point (struct
           | Javascript -> Some "node"
         in
         SC.add_alias_action sctx ~dir ~loc:(Some info.loc) (Alias.runtest ~dir)
-          ~stamp:("ppx-runner", name)
+          ~stamp:("ppx-runner", name, mode)
           (let exe =
              Path.build (Path.Build.relative inline_test_dir (name ^ ext))
            in

test/blackbox-tests/dune.inc

@@ -1193,6 +1193,14 @@
    test-cases/inline_tests
    (progn (run dune-cram run run.t) (diff? run.t run.t.corrected)))))
 
+(rule
+ (alias inline_tests-multi-mode)
+ (deps (package dune) (source_tree test-cases/inline_tests-multi-mode))
+ (action
+  (chdir
+   test-cases/inline_tests-multi-mode
+   (progn (run dune-cram run run.t) (diff? run.t run.t.corrected)))))
+
 (rule
  (alias install-dry-run)
  (deps (package dune) (source_tree test-cases/install-dry-run))
@@ -2578,6 +2586,7 @@
   (alias include-qualified)
   (alias incremental-rebuilds)
   (alias inline_tests)
+  (alias inline_tests-multi-mode)
   (alias install-dry-run)
   (alias install-libdir)
   (alias install-mandir)
@@ -2861,6 +2870,7 @@
   (alias include-qualified)
   (alias incremental-rebuilds)
   (alias inline_tests)
+  (alias inline_tests-multi-mode)
   (alias install-mandir)
   (alias install-multiple-contexts)
   (alias install-partial-package)

test/blackbox-tests/test-cases/inline_tests-multi-mode/run.t

@@ -0,0 +1,35 @@
+Test running inline tests in multiple modes at once
+
+Reproduction case for #3347
+
+  $ cat >dune-project <<EOF
+  > (lang dune 2.0)
+  > EOF
+
+  $ cat >dune <<EOF
+  > (library
+  >  (name test)
+  >  (libraries test_backend)
+  >  (modules test)
+  >  (inline_tests (modes byte native)))
+  > 
+  > (library
+  >  (name test_backend)
+  >  (modules ())
+  >  (inline_tests.backend
+  >   (generate_runner
+  >    (progn
+  >     (echo "Printf.eprintf \"Test %s\"\n")
+  >     (echo "  (match Sys.backend_type with")
+  >     (echo "   | Bytecode -> \"byte\"\n")
+  >     (echo "   | Native -> \"native\"\n")
+  >     (echo "   | Other s -> s)\n")))))
+  > EOF
+
+  $ touch test.ml
+
+  $ dune runtest
+           run alias runtest
+  Test byte
+           run alias runtest
+  Test native