Update tests and ensure out-dir still works

Author: valadaptive

tests/testsuite/artifact_dir.rs

@@ -179,7 +179,7 @@ fn include_only_the_binary_from_the_current_package() {
 }
 
 #[cargo_test]
-fn out_dir_is_a_file() {
+fn artifact_dir_is_a_file() {
     let p = project()
         .file("src/main.rs", r#"fn main() { println!("Hello, World!") }"#)
         .file("out", "")
@@ -256,7 +256,7 @@ fn avoid_build_scripts() {
 }
 
 #[cargo_test]
-fn cargo_build_out_dir() {
+fn cargo_build_artifact_dir() {
     let p = project()
         .file("src/main.rs", r#"fn main() { println!("Hello, World!") }"#)
         .file(
@@ -282,7 +282,7 @@ fn cargo_build_out_dir() {
 }
 
 #[cargo_test]
-fn unsupported_short_out_dir_flag() {
+fn unsupported_short_artifact_dir_flag() {
     let p = project()
         .file("src/main.rs", r#"fn main() { println!("Hello, World!") }"#)
         .build();
@@ -304,8 +304,57 @@ For more information, try '--help'.
         .run();
 }
 
+#[cargo_test]
+fn deprecated_out_dir() {
+    let p = project()
+        .file("src/main.rs", r#"fn main() { println!("Hello, World!") }"#)
+        .build();
+
+    p.cargo("build -Z unstable-options --out-dir out")
+        .masquerade_as_nightly_cargo(&["out-dir"])
+        .enable_mac_dsym()
+        .with_stderr_contains("[WARNING] the --out-dir flag has been changed to --artifact-dir")
+        .run();
+    check_dir_contents(
+        &p.root().join("out"),
+        &["foo"],
+        &["foo", "foo.dSYM"],
+        &["foo.exe", "foo.pdb"],
+        &["foo.exe"],
+    );
+}
+
+#[cargo_test]
+fn cargo_build_deprecated_out_dir() {
+    let p = project()
+        .file("src/main.rs", r#"fn main() { println!("Hello, World!") }"#)
+        .file(
+            ".cargo/config.toml",
+            r#"
+            [build]
+            out-dir = "out"
+            "#,
+        )
+        .build();
+
+    p.cargo("build -Z unstable-options")
+        .masquerade_as_nightly_cargo(&["out-dir"])
+        .enable_mac_dsym()
+        .with_stderr_contains(
+            "[WARNING] the out-dir config option has been changed to artifact-dir",
+        )
+        .run();
+    check_dir_contents(
+        &p.root().join("out"),
+        &["foo"],
+        &["foo", "foo.dSYM"],
+        &["foo.exe", "foo.pdb"],
+        &["foo.exe"],
+    );
+}
+
 fn check_dir_contents(
-    out_dir: &Path,
+    artifact_dir: &Path,
     expected_linux: &[&str],
     expected_mac: &[&str],
     expected_win_msvc: &[&str],
@@ -323,7 +372,7 @@ fn check_dir_contents(
         expected_linux
     };
 
-    let actual = list_dir(out_dir);
+    let actual = list_dir(artifact_dir);
     let mut expected = expected.iter().map(|s| s.to_string()).collect::<Vec<_>>();
     expected.sort_unstable();
     assert_eq!(actual, expected);