test: Move artifacts out of target

dustinblackman · Jan 1, 2024 · 2f2fd57 · 2f2fd57
1 parent e180db6
commit 2f2fd57
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /target
 /.bin
+/.tmp
 .gha/
 *.profraw
 lcov.info
diff --git a/Cargo.toml b/Cargo.toml
@@ -119,19 +119,23 @@ release = '''set -e
 '''
 
 test-coverage = '''set -e
+  rm -rf .tmp
   cargo build
   cargo llvm-cov nextest --ignore-filename-regex='_test.rs'
 '''
 test-coverage-html = '''set -e
+  rm -rf .tmp
   cargo build
   cargo llvm-cov nextest --open --ignore-filename-regex='_test.rs'
 '''
 test-coverage-lcov = '''set -e
+  rm -rf .tmp
   cargo build
   rm -f lcov.info
   cargo llvm-cov nextest --lcov --output-path lcov.info --ignore-filename-regex='_test.rs'
 '''
 test = '''set -e
+  rm -rf .tmp
   cargo build
   cargo nextest run
 '''

diff --git a/tests/binary_test.rs b/tests/binary_test.rs
@@ -43,7 +43,7 @@ mod cargo_install {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -65,7 +65,7 @@ mod cargo_install {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -87,7 +87,7 @@ mod cargo_install {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -109,7 +109,7 @@ mod cargo_install {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -131,7 +131,7 @@ mod cargo_install {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -153,7 +153,7 @@ mod cargo_install {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -180,7 +180,7 @@ mod binstall {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());
@@ -202,7 +202,7 @@ mod binstall {
                 default_features: None,
                 features: None,
             },
-            "./target/debug".into(),
+            "./.tmp".into(),
         );
 
         assert!(res.is_ok());

diff --git a/tests/cli_integration_test.rs b/tests/cli_integration_test.rs
@@ -1,22 +1,9 @@
-use cargo_run_bin::metadata;
-
-fn get_bin() -> String {
-    return metadata::get_project_root()
-        .unwrap()
-        .join(env!("CARGO_BIN_EXE_cargo-bin").replace(".exe", ""))
-        .to_str()
-        .unwrap()
-        .to_string();
-}
-
 mod direct {
     use assert_cmd::Command;
 
-    use super::get_bin;
-
     #[test]
     fn it_syncs_aliases_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("--sync-aliases").assert();
 
         let res = assert.success();
@@ -28,7 +15,7 @@ mod direct {
 
     #[test]
     fn it_install_all_bins_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("--install").assert();
 
         let res = assert.success();
@@ -40,7 +27,7 @@ mod direct {
 
     #[test]
     fn it_builds_all_bins_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("--build").assert();
 
         let res = assert.success();
@@ -52,7 +39,7 @@ mod direct {
 
     #[test]
     fn it_runs_help_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("--help").assert();
 
         let res = assert.success();
@@ -62,7 +49,7 @@ mod direct {
 
     #[test]
     fn it_runs_nextest_help_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("cargo-nextest").arg("--help").assert();
 
         let res = assert.success();
@@ -72,7 +59,7 @@ mod direct {
 
     #[test]
     fn it_fails_when_binary_is_not_configured() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("not-real").assert();
 
         let res = assert.failure();
@@ -86,11 +73,9 @@ mod direct {
 mod bin_prefix {
     use assert_cmd::Command;
 
-    use super::get_bin;
-
     #[test]
     fn it_syncs_aliases_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("bin").arg("--sync-aliases").assert();
 
         let res = assert.success();
@@ -102,7 +87,7 @@ mod bin_prefix {
 
     #[test]
     fn it_install_all_bins_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("bin").arg("--install").assert();
 
         let res = assert.success();
@@ -114,7 +99,7 @@ mod bin_prefix {
 
     #[test]
     fn it_builds_all_bins_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("bin").arg("--build").assert();
 
         let res = assert.success();
@@ -126,7 +111,7 @@ mod bin_prefix {
 
     #[test]
     fn it_runs_nextest_help_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("bin").arg("cargo-nextest").arg("--help").assert();
 
         let res = assert.success();
@@ -136,7 +121,7 @@ mod bin_prefix {
 
     #[test]
     fn it_runs_help_successfully() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("bin").arg("--help").assert();
 
         let res = assert.success();
@@ -146,7 +131,7 @@ mod bin_prefix {
 
     #[test]
     fn it_fails_when_binary_is_not_configured() {
-        let mut cmd = Command::cargo_bin(get_bin()).unwrap();
+        let mut cmd = Command::cargo_bin("cargo-bin").unwrap();
         let assert = cmd.arg("bin").arg("not-real").assert();
 
         let res = assert.failure();