From 092781c1fa139a1c7bf86af1ad00b3bcfc976f16 Mon Sep 17 00:00:00 2001 From: Jakub Stasiak Date: Wed, 1 Jul 2020 22:47:38 +0200 Subject: [PATCH] Compress two tests into one --- tests/testsuite/build.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index b3bc752fe..567a30e77 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -4991,29 +4991,20 @@ fn reduced_reproduction_8249() { } #[cargo_test] -fn target_directory_is_excluded_from_backups() { +fn target_directory_backup_exclusion() { let p = project() .file("Cargo.toml", &basic_bin_manifest("foo")) .file("src/foo.rs", &main_file(r#""i am foo""#, &[])) .build(); + // Newly created target/ should have CACHEDIR.TAG inside... p.cargo("build").run(); let cachedir_tag = p.build_dir().join("CACHEDIR.TAG"); assert!(cachedir_tag.is_file()); assert!(fs::read_to_string(&cachedir_tag) .unwrap() .starts_with("Signature: 8a477f597d28d172789f06886806bc55")); -} - -#[cargo_test] -fn target_directory_is_not_excluded_from_backups_if_it_already_exists() { - let p = project() - .file("Cargo.toml", &basic_bin_manifest("foo")) - .file("src/foo.rs", &main_file(r#""i am foo""#, &[])) - .build(); - - let cachedir_tag = p.build_dir().join("CACHEDIR.TAG"); - p.cargo("build").run(); + // ...but if target/ already exists CACHEDIR.TAG should not be created in it. fs::remove_file(&cachedir_tag).unwrap(); p.cargo("build").run(); assert!(!&cachedir_tag.is_file()); -- 2.39.5