From 1bf6c44cfb7ab88f19b2eb6c1c536c4ec3e2c6a5 Mon Sep 17 00:00:00 2001 From: Roj Date: Tue, 5 Jul 2022 12:29:17 +0300 Subject: [PATCH 1/9] feat: configuring test files in the config file This allows the user to use the config file to configure the included and excluded patterns of the test subcommand. It has many use cases, one of them is for example when the project uses dnt to transform the tests to work on Node.js, and place them in a directory called `out/`. The test tool should not look for test files in that directory, and instead of providing the CLI args to exclude that directory everytime, the user can just have a config file like the following: ```jsonc { "test": { "files": { "exclude": ["./out/"] } } } ``` This is just a single example, there might be more examples that will define the usefulness of the existence of this feature. --- cli/args/config_file.rs | 33 ++++++++++++++++++++++++++++++ cli/args/flags.rs | 25 +++++++++++------------ cli/args/mod.rs | 9 +++++++++ cli/lsp/language_server.rs | 11 ++++++++++ cli/tools/lint.rs | 2 +- cli/tools/test.rs | 41 ++++++++++++++++++++++++++++++++++---- 6 files changed, 103 insertions(+), 18 deletions(-) diff --git a/cli/args/config_file.rs b/cli/args/config_file.rs index 570aeba0d76f15..83137e64130597 100644 --- a/cli/args/config_file.rs +++ b/cli/args/config_file.rs @@ -419,6 +419,28 @@ pub struct FmtConfig { pub files: FilesConfig, } +#[derive(Clone, Debug, Default, Deserialize)] +#[serde(default, deny_unknown_fields)] +struct SerializedTestConfig { + pub files: SerializedFilesConfig, +} + +impl SerializedTestConfig { + pub fn into_resolved( + self, + config_file_specifier: &ModuleSpecifier, + ) -> Result { + Ok(TestConfig { + files: self.files.into_resolved(config_file_specifier)?, + }) + } +} + +#[derive(Clone, Debug, Default)] +pub struct TestConfig { + pub files: FilesConfig, +} + #[derive(Clone, Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub struct ConfigFileJson { @@ -427,6 +449,7 @@ pub struct ConfigFileJson { pub lint: Option, pub fmt: Option, pub tasks: Option, + pub test: Option, } #[derive(Clone, Debug)] @@ -605,6 +628,16 @@ impl ConfigFile { } } + pub fn to_test_config(&self) -> Result, AnyError> { + if let Some(config) = self.json.test.clone() { + let lint_config: SerializedTestConfig = serde_json::from_value(config) + .context("Failed to parse \"test\" configuration")?; + Ok(Some(lint_config.into_resolved(&self.specifier)?)) + } else { + Ok(None) + } + } + /// Return any tasks that are defined in the configuration file as a sequence /// of JSON objects providing the name of the task and the arguments of the /// task in a detail field. diff --git a/cli/args/flags.rs b/cli/args/flags.rs index 8b8cf8d86de99c..bfc696dbee66db 100644 --- a/cli/args/flags.rs +++ b/cli/args/flags.rs @@ -175,7 +175,7 @@ pub struct TestFlags { pub no_run: bool, pub fail_fast: Option, pub allow_none: bool, - pub include: Option>, + pub include: Vec, pub filter: Option, pub shuffle: Option, pub concurrent_jobs: NonZeroUsize, @@ -2674,15 +2674,14 @@ fn test_parse(flags: &mut Flags, matches: &clap::ArgMatches) { NonZeroUsize::new(1).unwrap() }; - let include = if matches.is_present("files") { - let files: Vec = matches + let include: Vec = if matches.is_present("files") { + matches .values_of("files") .unwrap() .map(String::from) - .collect(); - Some(files) + .collect::>() } else { - None + Vec::new() }; flags.coverage_dir = matches.value_of("coverage").map(String::from); @@ -4987,7 +4986,7 @@ mod tests { fail_fast: None, filter: Some("- foo".to_string()), allow_none: true, - include: Some(svec!["dir1/", "dir2/"]), + include: svec!["dir1/", "dir2/"], ignore: vec![], shuffle: None, concurrent_jobs: NonZeroUsize::new(1).unwrap(), @@ -5059,7 +5058,7 @@ mod tests { filter: None, allow_none: false, shuffle: None, - include: None, + include: vec![], ignore: vec![], concurrent_jobs: NonZeroUsize::new(4).unwrap(), trace_ops: false, @@ -5087,7 +5086,7 @@ mod tests { filter: None, allow_none: false, shuffle: None, - include: None, + include: vec![], ignore: vec![], concurrent_jobs: NonZeroUsize::new(1).unwrap(), trace_ops: false, @@ -5119,7 +5118,7 @@ mod tests { filter: None, allow_none: false, shuffle: None, - include: None, + include: vec![], ignore: vec![], concurrent_jobs: NonZeroUsize::new(1).unwrap(), trace_ops: false, @@ -5145,7 +5144,7 @@ mod tests { filter: None, allow_none: false, shuffle: Some(1), - include: None, + include: vec![], ignore: vec![], concurrent_jobs: NonZeroUsize::new(1).unwrap(), trace_ops: false, @@ -5171,7 +5170,7 @@ mod tests { filter: None, allow_none: false, shuffle: None, - include: None, + include: vec![], ignore: vec![], concurrent_jobs: NonZeroUsize::new(1).unwrap(), trace_ops: false, @@ -5198,7 +5197,7 @@ mod tests { filter: None, allow_none: false, shuffle: None, - include: None, + include: vec![], ignore: vec![], concurrent_jobs: NonZeroUsize::new(1).unwrap(), trace_ops: false, diff --git a/cli/args/mod.rs b/cli/args/mod.rs index accdeae7ff1c37..badfdc39d7701e 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -14,6 +14,7 @@ pub use config_file::LintConfig; pub use config_file::LintRulesConfig; pub use config_file::MaybeImportsResult; pub use config_file::ProseWrap; +pub use config_file::TestConfig; pub use config_file::TsConfig; pub use flags::*; @@ -244,6 +245,14 @@ impl CliOptions { } } + pub fn to_test_config(&self) -> Result, AnyError> { + if let Some(config_file) = &self.maybe_config_file { + config_file.to_test_config() + } else { + Ok(None) + } + } + pub fn to_fmt_config(&self) -> Result, AnyError> { if let Some(config) = &self.maybe_config_file { config.to_fmt_config() diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 41323a3009ec11..899c0eb2559e61 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -62,6 +62,7 @@ use crate::args::ConfigFile; use crate::args::Flags; use crate::args::FmtConfig; use crate::args::LintConfig; +use crate::args::TestConfig; use crate::args::TsConfig; use crate::deno_dir; use crate::file_fetcher::get_source_from_data_url; @@ -121,6 +122,8 @@ pub struct Inner { maybe_import_map_uri: Option, /// An optional configuration for linter which has been taken from specified config file. pub maybe_lint_config: Option, + /// An optional configuration for the test subcommand which has been taken from specified config file. + pub maybe_test_config: Option, /// A lazily create "server" for handling test run requests. maybe_testing_server: Option, /// A collection of measurements which instrument that performance of the LSP. @@ -255,6 +258,7 @@ impl Inner { maybe_import_map_uri: None, maybe_lint_config: None, maybe_fmt_config: None, + maybe_test_config: None, maybe_testing_server: None, module_registries, module_registries_location, @@ -631,10 +635,17 @@ impl Inner { anyhow!("Unable to update formatter configuration: {:?}", err) })? .unwrap_or_default(); + let test_config = config_file + .to_test_config() + .map_err(|err| { + anyhow!("Unable to update test configuration: {:?}", err) + })? + .unwrap_or_default(); self.maybe_config_file = Some(config_file); self.maybe_lint_config = Some(lint_config); self.maybe_fmt_config = Some(fmt_config); + self.maybe_test_config = Some(test_config); } Ok(()) diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs index 61129b75229559..fcf2cea4d4f442 100644 --- a/cli/tools/lint.rs +++ b/cli/tools/lint.rs @@ -70,7 +70,7 @@ pub async fn lint(flags: Flags, lint_flags: LintFlags) -> Result<(), AnyError> { } = lint_flags; // First, prepare final configuration. // Collect included and ignored files. CLI flags take precendence - // over config file, ie. if there's `files.ignore` in config file + // over config file, i.e. if there's `files.ignore` in config file // and `--ignore` CLI flag, only the flag value is taken into account. let mut include_files = args.clone(); let mut exclude_files = ignore.clone(); diff --git a/cli/tools/test.rs b/cli/tools/test.rs index 5586026cccefa8..c0648fd2d77c8b 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -14,6 +14,7 @@ use crate::fmt_errors::format_js_error; use crate::fs_util::collect_specifiers; use crate::fs_util::is_supported_test_ext; use crate::fs_util::is_supported_test_path; +use crate::fs_util::specifier_to_file_path; use crate::graph_util::contains_specifier; use crate::graph_util::graph_valid; use crate::located_script_name; @@ -1313,8 +1314,40 @@ async fn fetch_specifiers_with_test_mode( ignore: Vec, include_inline: bool, ) -> Result, AnyError> { - let mut specifiers_with_mode = - collect_specifiers_with_test_mode(include, ignore, include_inline)?; + let maybe_test_config = ps.options.to_test_config()?; + + let mut include_files = include.clone(); + let mut exclude_files = ignore.clone(); + + if let Some(test_config) = maybe_test_config.as_ref() { + if include_files.is_empty() { + include_files = test_config + .files + .include + .iter() + .map(|s| s.to_string()) + .collect::>(); + } + + if exclude_files.is_empty() { + exclude_files = test_config + .files + .exclude + .iter() + .filter_map(|s| specifier_to_file_path(s).ok()) + .collect::>(); + } + } + + if include_files.is_empty() { + include_files.push(".".to_string()); + } + + let mut specifiers_with_mode = collect_specifiers_with_test_mode( + include_files, + exclude_files, + include_inline, + )?; for (specifier, mode) in &mut specifiers_with_mode { let file = ps .file_fetcher @@ -1340,7 +1373,7 @@ pub async fn run_tests( Permissions::from_options(&ps.options.permissions_options()); let specifiers_with_mode = fetch_specifiers_with_test_mode( &ps, - test_flags.include.unwrap_or_else(|| vec![".".to_string()]), + test_flags.include, test_flags.ignore.clone(), test_flags.doc, ) @@ -1384,7 +1417,7 @@ pub async fn run_tests_with_watch( let permissions = Permissions::from_options(&ps.options.permissions_options()); - let include = test_flags.include.unwrap_or_else(|| vec![".".to_string()]); + let include = test_flags.include; let ignore = test_flags.ignore.clone(); let paths_to_watch: Vec<_> = include.iter().map(PathBuf::from).collect(); let no_check = ps.options.type_check_mode() == TypeCheckMode::None; From d647507de0751c78e59348f739528758bd237a31 Mon Sep 17 00:00:00 2001 From: Roj Date: Tue, 12 Jul 2022 18:25:48 +0300 Subject: [PATCH 2/9] chore: revert lsp changes --- cli/lsp/language_server.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 5766314f0cf348..98fe12e3fff187 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -122,8 +122,6 @@ pub struct Inner { maybe_import_map_uri: Option, /// An optional configuration for linter which has been taken from specified config file. pub maybe_lint_config: Option, - /// An optional configuration for the test subcommand which has been taken from specified config file. - pub maybe_test_config: Option, /// A lazily create "server" for handling test run requests. maybe_testing_server: Option, /// A collection of measurements which instrument that performance of the LSP. @@ -258,7 +256,6 @@ impl Inner { maybe_import_map_uri: None, maybe_lint_config: None, maybe_fmt_config: None, - maybe_test_config: None, maybe_testing_server: None, module_registries, module_registries_location, @@ -635,17 +632,10 @@ impl Inner { anyhow!("Unable to update formatter configuration: {:?}", err) })? .unwrap_or_default(); - let test_config = config_file - .to_test_config() - .map_err(|err| { - anyhow!("Unable to update test configuration: {:?}", err) - })? - .unwrap_or_default(); self.maybe_config_file = Some(config_file); self.maybe_lint_config = Some(lint_config); self.maybe_fmt_config = Some(fmt_config); - self.maybe_test_config = Some(test_config); } Ok(()) From c4a1d95218fa802bcae6a3fce159ae6deef8bbc2 Mon Sep 17 00:00:00 2001 From: Roj Date: Tue, 12 Jul 2022 18:26:35 +0300 Subject: [PATCH 3/9] chore: remove unused import --- cli/lsp/language_server.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 98fe12e3fff187..05d23bf0088415 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -62,7 +62,6 @@ use crate::args::ConfigFile; use crate::args::Flags; use crate::args::FmtConfig; use crate::args::LintConfig; -use crate::args::TestConfig; use crate::args::TsConfig; use crate::deno_dir; use crate::file_fetcher::get_source_from_data_url; From 1c0c4f58863d92cb9a41f69860998bf69d562c6c Mon Sep 17 00:00:00 2001 From: Roj Date: Fri, 15 Jul 2022 21:04:56 +0300 Subject: [PATCH 4/9] chore: add tests --- cli/tests/integration/test_tests.rs | 12 ++++++++++++ cli/tests/testdata/test/collect/deno.jsonc | 7 +++++++ cli/tests/testdata/test/collect/deno.malformed.jsonc | 5 +++++ .../testdata/test/collect_with_malformed_config.out | 4 ++++ 4 files changed, 28 insertions(+) create mode 100644 cli/tests/testdata/test/collect/deno.jsonc create mode 100644 cli/tests/testdata/test/collect/deno.malformed.jsonc create mode 100644 cli/tests/testdata/test/collect_with_malformed_config.out diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs index e1c7700db77f88..d5d5323c45312e 100644 --- a/cli/tests/integration/test_tests.rs +++ b/cli/tests/integration/test_tests.rs @@ -62,6 +62,18 @@ itest!(collect { output: "test/collect.out", }); +itest!(test_with_config { + args: "test --config test/collect/deno.jsonc test/collect", + exit_code: 0, + output: "test/collect.out" +}); + +itest!(fmt_with_malformed_config { + args: "test --config test/collect/deno.malformed.jsonc", + exit_code: 1, + output: "test/collect_with_malformed_config.out", +}); + itest!(jobs_flag { args: "test test/short-pass.ts --jobs", exit_code: 0, diff --git a/cli/tests/testdata/test/collect/deno.jsonc b/cli/tests/testdata/test/collect/deno.jsonc new file mode 100644 index 00000000000000..72c5098519df11 --- /dev/null +++ b/cli/tests/testdata/test/collect/deno.jsonc @@ -0,0 +1,7 @@ +{ + "test": { + "files": { + "exclude": ["./collect/ignore"] + } + } +} diff --git a/cli/tests/testdata/test/collect/deno.malformed.jsonc b/cli/tests/testdata/test/collect/deno.malformed.jsonc new file mode 100644 index 00000000000000..f2d8cbc6526dd0 --- /dev/null +++ b/cli/tests/testdata/test/collect/deno.malformed.jsonc @@ -0,0 +1,5 @@ +{ + "test": { + "dont_know_this_field": {} + } +} diff --git a/cli/tests/testdata/test/collect_with_malformed_config.out b/cli/tests/testdata/test/collect_with_malformed_config.out new file mode 100644 index 00000000000000..25c34406fda543 --- /dev/null +++ b/cli/tests/testdata/test/collect_with_malformed_config.out @@ -0,0 +1,4 @@ +error: Failed to parse "test" configuration + +Caused by: + unknown field `dont_know_this_field`, expected `files` From 14be67ff9bd20313071bcc2de546f5607c6e9fd7 Mon Sep 17 00:00:00 2001 From: Roj Date: Fri, 15 Jul 2022 22:05:54 +0300 Subject: [PATCH 5/9] add include test --- cli/tests/integration/test_tests.rs | 8 +++++++- cli/tests/testdata/test/collect.2.out | 5 +++++ cli/tests/testdata/test/collect/deno.2.jsonc | 8 ++++++++ cli/tests/testdata/test/collect/deno.jsonc | 2 +- cli/tests/testdata/test/collect/include/test.ts | 0 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 cli/tests/testdata/test/collect.2.out create mode 100644 cli/tests/testdata/test/collect/deno.2.jsonc create mode 100644 cli/tests/testdata/test/collect/include/test.ts diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs index d5d5323c45312e..78284e48a499b3 100644 --- a/cli/tests/integration/test_tests.rs +++ b/cli/tests/integration/test_tests.rs @@ -68,7 +68,13 @@ itest!(test_with_config { output: "test/collect.out" }); -itest!(fmt_with_malformed_config { +itest!(test_with_config2 { + args: "test --config test/collect/deno.2.jsonc test/collect", + exit_code: 0, + output: "test/collect.2.out" +}); + +itest!(test_with_malformed_config { args: "test --config test/collect/deno.malformed.jsonc", exit_code: 1, output: "test/collect_with_malformed_config.out", diff --git a/cli/tests/testdata/test/collect.2.out b/cli/tests/testdata/test/collect.2.out new file mode 100644 index 00000000000000..653a6d1e4c00eb --- /dev/null +++ b/cli/tests/testdata/test/collect.2.out @@ -0,0 +1,5 @@ +Check [WILDCARD]/test/collect/include/test.ts +running 0 tests from ./test/collect/include/test.ts + +ok | 0 passed | 0 failed ([WILDCARD]) + diff --git a/cli/tests/testdata/test/collect/deno.2.jsonc b/cli/tests/testdata/test/collect/deno.2.jsonc new file mode 100644 index 00000000000000..38e7912fbc71da --- /dev/null +++ b/cli/tests/testdata/test/collect/deno.2.jsonc @@ -0,0 +1,8 @@ +{ + "test": { + "files": { + "exclude": ["./"], + "include": ["./include/"] + } + } +} diff --git a/cli/tests/testdata/test/collect/deno.jsonc b/cli/tests/testdata/test/collect/deno.jsonc index 72c5098519df11..b8acda27d09376 100644 --- a/cli/tests/testdata/test/collect/deno.jsonc +++ b/cli/tests/testdata/test/collect/deno.jsonc @@ -1,7 +1,7 @@ { "test": { "files": { - "exclude": ["./collect/ignore"] + "exclude": ["./ignore"] } } } diff --git a/cli/tests/testdata/test/collect/include/test.ts b/cli/tests/testdata/test/collect/include/test.ts new file mode 100644 index 00000000000000..e69de29bb2d1d6 From 0bfcbfdd20f99002dfefbc159af7f8b9ed14d5f7 Mon Sep 17 00:00:00 2001 From: Roj Date: Fri, 15 Jul 2022 22:24:45 +0300 Subject: [PATCH 6/9] refactor --- cli/tests/integration/test_tests.rs | 6 +++--- .../testdata/test/collect/{deno.2.jsonc => deno2.jsonc} | 0 cli/tests/testdata/test/{collect.2.out => collect2.out} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename cli/tests/testdata/test/collect/{deno.2.jsonc => deno2.jsonc} (100%) rename cli/tests/testdata/test/{collect.2.out => collect2.out} (100%) diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs index 78284e48a499b3..cca720648a3c6f 100644 --- a/cli/tests/integration/test_tests.rs +++ b/cli/tests/integration/test_tests.rs @@ -65,13 +65,13 @@ itest!(collect { itest!(test_with_config { args: "test --config test/collect/deno.jsonc test/collect", exit_code: 0, - output: "test/collect.out" + output: "test/collect.out", }); itest!(test_with_config2 { - args: "test --config test/collect/deno.2.jsonc test/collect", + args: "test --config test/collect/deno2.jsonc test/collect", exit_code: 0, - output: "test/collect.2.out" + output: "test/collect2.out", }); itest!(test_with_malformed_config { diff --git a/cli/tests/testdata/test/collect/deno.2.jsonc b/cli/tests/testdata/test/collect/deno2.jsonc similarity index 100% rename from cli/tests/testdata/test/collect/deno.2.jsonc rename to cli/tests/testdata/test/collect/deno2.jsonc diff --git a/cli/tests/testdata/test/collect.2.out b/cli/tests/testdata/test/collect2.out similarity index 100% rename from cli/tests/testdata/test/collect.2.out rename to cli/tests/testdata/test/collect2.out From ecd9b312070c062144ec84ce58f965e03521982e Mon Sep 17 00:00:00 2001 From: Roj Date: Sat, 16 Jul 2022 12:21:54 +0300 Subject: [PATCH 7/9] chore: update testdata --- cli/tests/testdata/test/collect.out | 5 ++++- cli/tests/testdata/test/collect/deno2.jsonc | 4 ++-- cli/tests/testdata/test/collect/include.ts | 0 cli/tests/testdata/test/collect/include/2_test.ts | 0 cli/tests/testdata/test/collect2.out | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 cli/tests/testdata/test/collect/include.ts create mode 100644 cli/tests/testdata/test/collect/include/2_test.ts diff --git a/cli/tests/testdata/test/collect.out b/cli/tests/testdata/test/collect.out index 9f3495298ca8af..473c29678905fe 100644 --- a/cli/tests/testdata/test/collect.out +++ b/cli/tests/testdata/test/collect.out @@ -1,5 +1,8 @@ +Check [WILDCARD]/test/collect/include/2_test.ts +Check [WILDCARD]/test/collect/include/test.ts Check [WILDCARD]/test/collect/test.ts +running 0 tests from ./test/collect/include/2_test.ts +running 0 tests from ./test/collect/include/test.ts running 0 tests from ./test/collect/test.ts ok | 0 passed | 0 failed ([WILDCARD]) - diff --git a/cli/tests/testdata/test/collect/deno2.jsonc b/cli/tests/testdata/test/collect/deno2.jsonc index 38e7912fbc71da..a4d244e31e4681 100644 --- a/cli/tests/testdata/test/collect/deno2.jsonc +++ b/cli/tests/testdata/test/collect/deno2.jsonc @@ -1,8 +1,8 @@ { "test": { "files": { - "exclude": ["./"], - "include": ["./include/"] + "include": ["./include/"], + "exclude": ["./ignore", "./include/2_test.ts"] } } } diff --git a/cli/tests/testdata/test/collect/include.ts b/cli/tests/testdata/test/collect/include.ts new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/cli/tests/testdata/test/collect/include/2_test.ts b/cli/tests/testdata/test/collect/include/2_test.ts new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/cli/tests/testdata/test/collect2.out b/cli/tests/testdata/test/collect2.out index 653a6d1e4c00eb..4bbf4cfe23148a 100644 --- a/cli/tests/testdata/test/collect2.out +++ b/cli/tests/testdata/test/collect2.out @@ -1,5 +1,6 @@ Check [WILDCARD]/test/collect/include/test.ts +Check [WILDCARD]/test/collect/test.ts running 0 tests from ./test/collect/include/test.ts +running 0 tests from ./test/collect/test.ts ok | 0 passed | 0 failed ([WILDCARD]) - From 208c04131c71624d792f9b24b553fc40ea5c8e78 Mon Sep 17 00:00:00 2001 From: Roj Date: Sat, 16 Jul 2022 12:28:34 +0300 Subject: [PATCH 8/9] fix: add missed lines --- cli/tests/testdata/test/collect.out | 1 + cli/tests/testdata/test/collect2.out | 1 + 2 files changed, 2 insertions(+) diff --git a/cli/tests/testdata/test/collect.out b/cli/tests/testdata/test/collect.out index 473c29678905fe..dc5161a9095eb2 100644 --- a/cli/tests/testdata/test/collect.out +++ b/cli/tests/testdata/test/collect.out @@ -6,3 +6,4 @@ running 0 tests from ./test/collect/include/test.ts running 0 tests from ./test/collect/test.ts ok | 0 passed | 0 failed ([WILDCARD]) + diff --git a/cli/tests/testdata/test/collect2.out b/cli/tests/testdata/test/collect2.out index 4bbf4cfe23148a..af31ee31e2016e 100644 --- a/cli/tests/testdata/test/collect2.out +++ b/cli/tests/testdata/test/collect2.out @@ -4,3 +4,4 @@ running 0 tests from ./test/collect/include/test.ts running 0 tests from ./test/collect/test.ts ok | 0 passed | 0 failed ([WILDCARD]) + From b26cebc7beed51b0420933c7e53bf1bcaf419e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Mon, 18 Jul 2022 00:31:54 +0200 Subject: [PATCH 9/9] reset CI