From 6dd5d4fbc9a07338488d13c7a8581620d94f164c Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 16 Jan 2025 11:24:42 +0100 Subject: [PATCH] Reduce path size for inline-tests artifacts Signed-off-by: Hugo Heuzard --- doc/changes/11307.md | 2 ++ src/dune_rules/dir_status.ml | 3 +-- src/dune_rules/inline_tests.ml | 6 ++---- .../test-cases/inline_tests/parallel.t/run.t | 8 ++++---- test/blackbox-tests/test-cases/inline_tests/simple.t | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 doc/changes/11307.md diff --git a/doc/changes/11307.md b/doc/changes/11307.md new file mode 100644 index 00000000000..e70ce55c132 --- /dev/null +++ b/doc/changes/11307.md @@ -0,0 +1,2 @@ +- Use shorter path for inline-tests artifacts. + (@hhugo, #11307) \ No newline at end of file diff --git a/src/dune_rules/dir_status.ml b/src/dune_rules/dir_status.ml index de7f19f1303..b7b0213c2cc 100644 --- a/src/dune_rules/dir_status.ml +++ b/src/dune_rules/dir_status.ml @@ -179,12 +179,11 @@ let directory_targets_of_library | true -> let dir_target = let lib_name = Lib_name.Local.to_string (snd name) in - let name = sprintf "inline_test_runner_%s" lib_name in let inline_test_dir = let inline_test_name = sprintf "%s.inline-tests" lib_name in Path.Build.relative dir ("." ^ inline_test_name) in - Path.Build.relative inline_test_dir (name ^ Js_of_ocaml.Ext.wasm_dir) + Path.Build.relative inline_test_dir ("run" ^ Js_of_ocaml.Ext.wasm_dir) in Path.Build.Map.singleton dir_target loc) >>= when_enabled ~dir ~enabled_if diff --git a/src/dune_rules/inline_tests.ml b/src/dune_rules/inline_tests.ml index cb56097c2c7..aa38a315dc6 100644 --- a/src/dune_rules/inline_tests.ml +++ b/src/dune_rules/inline_tests.ml @@ -85,10 +85,8 @@ include Sub_system.Register_end_point (struct sprintf "%s.inline-tests" (Lib_name.Local.to_string lib_name) in let inline_test_dir = Path.Build.relative dir ("." ^ inline_test_name) in - let obj_dir = Obj_dir.make_exe ~dir:inline_test_dir ~name:inline_test_name in - let name = - sprintf "inline_test_runner_%s" (Lib_name.Local.to_string (snd lib.name)) - in + let name = "run" in + let obj_dir = Obj_dir.make_exe ~dir:inline_test_dir ~name in let main_module = let name = Module_name.of_string name in Module.generated ~kind:Impl ~src_dir:inline_test_dir [ name ] diff --git a/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t b/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t index 9333dbaf2c0..dd82ca0d6a9 100644 --- a/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t +++ b/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t @@ -5,14 +5,14 @@ First, build silently to avoid some noise See that `test1/runtest`, which uses `fake_backend_1, only runs one inline test runner $ dune build --display short @test1/runtest 2>&1 | grep alias - inline_test_runner_test_lib1 alias test1/runtest + run alias test1/runtest See that `test2/runtest`, which uses `fake_backend_2`, runs one inline test runner per partition $ dune build --display short @test2/runtest 2>&1 | grep alias - inline_test_runner_test_lib2 alias test2/runtest - inline_test_runner_test_lib2 alias test2/runtest - inline_test_runner_test_lib2 alias test2/runtest + run alias test2/runtest + run alias test2/runtest + run alias test2/runtest See that we indeed have 3 partitions diff --git a/test/blackbox-tests/test-cases/inline_tests/simple.t b/test/blackbox-tests/test-cases/inline_tests/simple.t index 33cafda4230..df15d03a1cb 100644 --- a/test/blackbox-tests/test-cases/inline_tests/simple.t +++ b/test/blackbox-tests/test-cases/inline_tests/simple.t @@ -27,7 +27,7 @@ File "dune", line 9, characters 1-40: 9 | (inline_tests (backend backend_simple))) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Fatal error: exception File ".foo_simple.inline-tests/inline_test_runner_foo_simple.ml-gen", line 1, characters 40-46: Assertion failed + Fatal error: exception File ".foo_simple.inline-tests/run.ml-gen", line 1, characters 40-46: Assertion failed [1] The expected behavior for the following three tests is to output nothing: the tests are disabled or ignored. @@ -41,5 +41,5 @@ The expected behavior for the following three tests is to output nothing: the te File "dune", line 9, characters 1-40: 9 | (inline_tests (backend backend_simple))) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Fatal error: exception File ".foo_simple.inline-tests/inline_test_runner_foo_simple.ml-gen", line 1, characters 40-46: Assertion failed + Fatal error: exception File ".foo_simple.inline-tests/run.ml-gen", line 1, characters 40-46: Assertion failed [1]