From dcbbcd23f5dd8601e2851aded4cabc6557164363 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Fri, 9 Feb 2024 13:33:05 -0700 Subject: refactor: split integration tests from CLI (part 1) (#22308) This PR separates integration tests from CLI tests into a new project named `cli_tests`. This is a prerequisite for an integration test runner that can work with either the CLI binary in the current project, or one that is built ahead of time. ## Background Rust does not have the concept of artifact dependencies yet (https://github.com/rust-lang/cargo/issues/9096). Because of this, the only way we can ensure a binary is built before running associated tests is by hanging tests off the crate with the binary itself. Unfortunately this means that to run those tests, you _must_ build the binary and in the case of the deno executable that might be a 10 minute wait in release mode. ## Implementation To allow for tests to run with and without the requirement that the binary is up-to-date, we split the integration tests into a project of their own. As these tests would not require the binary to build itself before being run as-is, we add a stub integration `[[test]]` target in the `cli` project that invokes these tests using `cargo test`. The stub test runner we add has `harness = false` so that we can get access to a `main` function. This `main` function's sole job is to `execvp` the command `cargo test -p deno_cli`, effectively "calling" another cargo target. This ensures that the deno executable is always correctly rebuilt before running the stub test runner from `cli`, and gets us closer to be able to run the entire integration test suite on arbitrary deno executables (and therefore split the build into multiple phases). The new `cli_tests` project lives within `cli` to avoid a large PR. In later PRs, the test data will be split from the `cli` project. As there are a few thousand files, it'll be better to do this as a completely separate PR to avoid noise. --- cli/Cargo.toml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'cli/Cargo.toml') diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f9e59abc3..cb52d3966 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -4,6 +4,7 @@ name = "deno" version = "1.40.4" authors.workspace = true +autotests = false default-run = "deno" edition.workspace = true exclude = ["tests/testdata/npm/registry/*"] @@ -16,6 +17,11 @@ name = "deno" path = "main.rs" doc = false +[[test]] +name = "integration" +path = "tests/integration_tests_runner.rs" +harness = false + [[bench]] name = "deno_bench" harness = false @@ -149,19 +155,8 @@ nix.workspace = true [dev-dependencies] deno_bench_util.workspace = true -deno_core = { workspace = true, features = ["include_js_files_for_snapshotting", "unsafe_use_unprotected_platform"] } -fastwebsockets = { workspace = true, features = ["upgrade", "unstable-split"] } -flaky_test = "=0.1.0" -http.workspace = true -http-body-util.workspace = true -hyper.workspace = true -hyper-util.workspace = true -once_cell.workspace = true -os_pipe.workspace = true pretty_assertions.workspace = true test_util.workspace = true -trust-dns-client = "=0.22.0" -trust-dns-server = "=0.22.1" [package.metadata.winres] # This section defines the metadata that appears in the deno.exe PE header. -- cgit v1.2.3