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/tests/integration_tests_runner.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 cli/tests/integration_tests_runner.rs (limited to 'cli/tests/integration_tests_runner.rs') diff --git a/cli/tests/integration_tests_runner.rs b/cli/tests/integration_tests_runner.rs new file mode 100644 index 000000000..12e83a019 --- /dev/null +++ b/cli/tests/integration_tests_runner.rs @@ -0,0 +1,18 @@ +// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. +pub fn main() { + let mut args = vec!["cargo", "test", "-p", "cli_tests", "--features", "run"]; + + if !cfg!(debug_assertions) { + args.push("--release"); + } + + args.push("--"); + + // If any args were passed to this process, pass them through to the child + let orig_args = std::env::args().skip(1).collect::>(); + let orig_args: Vec<&str> = + orig_args.iter().map(|x| x.as_ref()).collect::>(); + args.extend(orig_args); + + test_util::spawn::exec_replace("cargo", &args).unwrap(); +} -- cgit v1.2.3