diff --git a/tests/functional/repl_characterization/data/repl_overlays.test b/tests/functional/repl_characterization/data/repl_overlays.test deleted file mode 100644 index 56f1392e1..000000000 --- a/tests/functional/repl_characterization/data/repl_overlays.test +++ /dev/null @@ -1,5 +0,0 @@ -Check basic `repl-overlays` functionality. -@args --repl-overlays -@args ${PWD}/extra_data/repl-overlay-packages-is-pkgs.nix - nix-repl> pkgs - { default = "my package"; } diff --git a/tests/functional/repl_characterization/data/repl_overlays_compose.test b/tests/functional/repl_characterization/data/repl_overlays_compose.test deleted file mode 100644 index b674a55be..000000000 --- a/tests/functional/repl_characterization/data/repl_overlays_compose.test +++ /dev/null @@ -1,7 +0,0 @@ -Check that multiple `repl-overlays` can compose together -@args --repl-overlays -@args "${PWD}/extra_data/repl-overlays-compose-1.nix ${PWD}/extra_data/repl-overlays-compose-2.nix" - nix-repl> var - "abc" - nix-repl> varUsingFinal - "final value is: puppy" diff --git a/tests/functional/repl_characterization/data/repl_overlays_destructure_without_dotdotdot_errors.test b/tests/functional/repl_characterization/data/repl_overlays_destructure_without_dotdotdot_errors.test deleted file mode 100644 index ca5ccc01f..000000000 --- a/tests/functional/repl_characterization/data/repl_overlays_destructure_without_dotdotdot_errors.test +++ /dev/null @@ -1,10 +0,0 @@ -`repl-overlays` that try to parse out the `info` argument without a `...` error. -@args --repl-overlays -@args ${PWD}/extra_data/repl-overlay-no-dotdotdot.nix -@should-start false - error: Expected first argument of repl-overlays to have ... to allow future versions of Lix to add additional attributes to the argument - at $TEST_DATA/extra_data/repl-overlay-no-dotdotdot.nix:4:3: - 3| in - 4| {currentSystem}: final: prev: { - | ^ - 5| inherit puppy; diff --git a/tests/functional/repl_characterization/data/repl_overlays_destructure_without_formals_ok.test b/tests/functional/repl_characterization/data/repl_overlays_destructure_without_formals_ok.test deleted file mode 100644 index 3aa89e434..000000000 --- a/tests/functional/repl_characterization/data/repl_overlays_destructure_without_formals_ok.test +++ /dev/null @@ -1,5 +0,0 @@ -`repl-overlays` that don't destructure the `info` argument are OK. -@args --repl-overlays -@args ${PWD}/extra_data/repl-overlay-no-formals.nix - nix-repl> 1 - 1 diff --git a/tests/functional/repl_characterization/repl_characterization.cc b/tests/functional/repl_characterization/repl_characterization.cc index 197edff6b..84fd6b39d 100644 --- a/tests/functional/repl_characterization/repl_characterization.cc +++ b/tests/functional/repl_characterization/repl_characterization.cc @@ -176,11 +176,7 @@ TEST_F(ReplSessionTest, tidy) runReplTestPath(#name); \ } -REPL_TEST(repl_overlays); REPL_TEST(repl_overlays_regression_l777); -REPL_TEST(repl_overlays_compose); -REPL_TEST(repl_overlays_destructure_without_dotdotdot_errors); -REPL_TEST(repl_overlays_destructure_without_formals_ok); REPL_TEST(stack_vars); REPL_TEST(stacktrace_invalid_arg); REPL_TEST(stacktrace_oob); diff --git a/tests/functional2/repl_characterization/overlays/compose.md b/tests/functional2/repl_characterization/overlays/compose.md new file mode 100644 index 000000000..b887d146a --- /dev/null +++ b/tests/functional2/repl_characterization/overlays/compose.md @@ -0,0 +1,24 @@ +--- +args: ['-f', '{PWD}/repl_overlays_compose.nix', '--repl-overlays', '{PWD}/repl-overlays-compose-1.nix {PWD}/repl-overlays-compose-2.nix'] +files: ['repl_overlays_compose.nix', 'repl-overlays-compose-1.nix', 'repl-overlays-compose-2.nix'] +--- + +```output +Lix VERSION +Type :? for help. +Loading installable ''... +Added 1 variables. +Loading 'repl-overlays'... +Added 3 variables. +``` +Check that multiple `repl-overlays` can compose together +```nix +var +varUsingFinal +``` +```output +"abc" + +"final value is: puppy" + +``` diff --git a/tests/functional2/repl_characterization/overlays/destructure_no_formals_ok.md b/tests/functional2/repl_characterization/overlays/destructure_no_formals_ok.md new file mode 100644 index 000000000..2f62f1237 --- /dev/null +++ b/tests/functional2/repl_characterization/overlays/destructure_no_formals_ok.md @@ -0,0 +1,12 @@ +--- +args: ['--repl-overlays', '{PWD}/repl-overlay-no-formals.nix'] +files: ['repl-overlay-no-formals.nix'] +--- + +`repl-overlays` that don't destructure the `info` argument are OK. + +```output +Lix VERSION +Type :? for help. +Loading 'repl-overlays'... +``` diff --git a/tests/functional2/repl_characterization/overlays/overlays_destructure_without_dotdotdot_errors.md b/tests/functional2/repl_characterization/overlays/overlays_destructure_without_dotdotdot_errors.md new file mode 100644 index 000000000..c212a11df --- /dev/null +++ b/tests/functional2/repl_characterization/overlays/overlays_destructure_without_dotdotdot_errors.md @@ -0,0 +1,19 @@ +--- +args: ['--repl-overlays', '{PWD}/repl-overlay-no-dotdotdot.nix'] +should_fail: True +files: ['repl-overlay-no-dotdotdot.nix'] +--- + +`repl-overlays` that try to parse the `info` argument without a `...` error. + +```output +Lix VERSION +Type :? for help. +Loading 'repl-overlays'... +error: Expected first argument of repl-overlays to have ... to allow future versions of Lix to add additional attributes to the argument + at /pwd/repl-overlay-no-dotdotdot.nix:4:3: + 3| in + 4| {currentSystem}: final: prev: { + | ^ + 5| inherit puppy; +``` diff --git a/tests/functional/repl_characterization/data/extra_data/repl-overlay-no-dotdotdot.nix b/tests/functional2/repl_characterization/overlays/repl-overlay-no-dotdotdot.nix similarity index 100% rename from tests/functional/repl_characterization/data/extra_data/repl-overlay-no-dotdotdot.nix rename to tests/functional2/repl_characterization/overlays/repl-overlay-no-dotdotdot.nix diff --git a/tests/functional/repl_characterization/data/extra_data/repl-overlay-no-formals.nix b/tests/functional2/repl_characterization/overlays/repl-overlay-no-formals.nix similarity index 100% rename from tests/functional/repl_characterization/data/extra_data/repl-overlay-no-formals.nix rename to tests/functional2/repl_characterization/overlays/repl-overlay-no-formals.nix diff --git a/tests/functional/repl_characterization/data/extra_data/repl-overlay-packages-is-pkgs.nix b/tests/functional2/repl_characterization/overlays/repl-overlay-packages-is-pkgs.nix similarity index 100% rename from tests/functional/repl_characterization/data/extra_data/repl-overlay-packages-is-pkgs.nix rename to tests/functional2/repl_characterization/overlays/repl-overlay-packages-is-pkgs.nix diff --git a/tests/functional/repl_characterization/data/extra_data/repl-overlays-compose-1.nix b/tests/functional2/repl_characterization/overlays/repl-overlays-compose-1.nix similarity index 100% rename from tests/functional/repl_characterization/data/extra_data/repl-overlays-compose-1.nix rename to tests/functional2/repl_characterization/overlays/repl-overlays-compose-1.nix diff --git a/tests/functional/repl_characterization/data/extra_data/repl-overlays-compose-2.nix b/tests/functional2/repl_characterization/overlays/repl-overlays-compose-2.nix similarity index 100% rename from tests/functional/repl_characterization/data/extra_data/repl-overlays-compose-2.nix rename to tests/functional2/repl_characterization/overlays/repl-overlays-compose-2.nix diff --git a/tests/functional2/repl_characterization/overlays/repl_overlays.md b/tests/functional2/repl_characterization/overlays/repl_overlays.md new file mode 100644 index 000000000..bbad4f35f --- /dev/null +++ b/tests/functional2/repl_characterization/overlays/repl_overlays.md @@ -0,0 +1,23 @@ +--- +args: ['-f', '{PWD}/repl_overlays.nix', '--repl-overlays', '{PWD}/repl-overlay-packages-is-pkgs.nix'] +files: ['repl_overlays.nix', 'repl-overlay-packages-is-pkgs.nix'] +--- + +```output +Lix VERSION +Type :? for help. +Loading installable ''... +Added 1 variables. +Loading 'repl-overlays'... +Added 2 variables. +``` + +Check basic `repl-overlays` functionality. + +```nix +pkgs +``` +```output +{ default = "my package"; } + +``` diff --git a/tests/functional/repl_characterization/data/repl_overlays.nix b/tests/functional2/repl_characterization/overlays/repl_overlays.nix similarity index 100% rename from tests/functional/repl_characterization/data/repl_overlays.nix rename to tests/functional2/repl_characterization/overlays/repl_overlays.nix diff --git a/tests/functional/repl_characterization/data/repl_overlays_compose.nix b/tests/functional2/repl_characterization/overlays/repl_overlays_compose.nix similarity index 100% rename from tests/functional/repl_characterization/data/repl_overlays_compose.nix rename to tests/functional2/repl_characterization/overlays/repl_overlays_compose.nix