test: extend some edge case on feature dep

Author: baby230211

tests/testsuite/publish.rs

@@ -1687,9 +1687,26 @@ repository = "foo"
 }
 
 #[cargo_test]
-fn publish_feature_point_to_stripped_dep() {
+fn publish_with_feature_point_diff_kinds_dep() {
     let registry = RegistryBuilder::new().http_api().http_index().build();
-
+    Package::new("normal-only", "1.0.0")
+        .feature("cat", &[])
+        .publish();
+    Package::new("build-only", "1.0.0")
+        .feature("cat", &[])
+        .publish();
+    Package::new("normal-and-dev", "1.0.0")
+        .feature("cat", &[])
+        .publish();
+    Package::new("target-normal-only", "1.0.0")
+        .feature("cat", &[])
+        .publish();
+    Package::new("target-build-only", "1.0.0")
+        .feature("cat", &[])
+        .publish();
+    Package::new("target-normal-and-dev", "1.0.0")
+        .feature("cat", &[])
+        .publish();
     let p = project()
         .file(
             "Cargo.toml",
@@ -1707,11 +1724,38 @@ fn publish_feature_point_to_stripped_dep() {
 
 
             [features]
-            foo_feature = ["bar/cat"]
+            foo_feature = [
+                "normal-only/cat",
+                "build-only/cat",
+                "dev-only/cat",
+                "normal-and-dev/cat",
+                "target-normal-only/cat",
+                "target-build-only/cat",
+                "target-dev-only/cat",
+                "target-normal-and-dev/cat",
+            ]
+
+            [dependencies]
+            normal-only = { version = "1.0", features = ["cat"] }
+            normal-and-dev = { version = "1.0", features = ["cat"] }
+
+            [build-dependencies]
+            build-only = { version = "1.0", features = ["cat"] }
+
+            [dev-dependencies]
+            dev-only = { path = "../bar", features = ["cat"] }
+            normal-and-dev = { version = "1.0", features = ["cat"] }
 
-            [dev-dependencies.bar]
-            path = "../bar"
-            features = ["cat"]
+            [target.'cfg(unix)'.dependencies]
+            target-normal-only = { version = "1.0", features = ["cat"] }
+            target-normal-and-dev = { version = "1.0", features = ["cat"] }
+
+            [target.'cfg(unix)'.build-dependencies]
+            target-build-only = { version = "1.0", features = ["cat"] }
+
+            [target.'cfg(unix)'.dev-dependencies]
+            target-dev-only = { path = "../bar", features = ["cat"] }
+            target-normal-and-dev = { version = "1.0", features = ["cat"] }
             "#,
         )
         .file("src/main.rs", "")
@@ -1738,72 +1782,20 @@ fn publish_feature_point_to_stripped_dep() {
         .build();
 
     p.cargo("publish --no-verify")
+        .env("RUSTFLAGS", "--cfg unix")
         .replace_crates_io(registry.index_url())
+        .with_status(101)
         .with_stderr(
             "\
 [UPDATING] [..]
 [PACKAGING] foo v0.1.0 [..]
-[PACKAGED] [..] files, [..] ([..] compressed)
-[UPLOADING] foo v0.1.0 [..]
-[UPLOADED] foo v0.1.0 [..]
-[NOTE] waiting [..]
-You may press ctrl-c [..]
-[PUBLISHED] foo v0.1.0 [..]
+[ERROR] failed to prepare local package [..]
+
+Caused by:
+  feature `foo_feature` includes `target-dev-only/cat`, but `target-dev-only` is not a dependency
 ",
         )
         .run();
-
-    publish::validate_upload_with_contents(
-        r#"
-        {
-          "authors": [],
-          "badges": {},
-          "categories": [],
-          "deps": [],
-          "description": "foo",
-          "documentation": "foo",
-          "features": {
-            "foo_feature": []
-          },
-          "homepage": "foo",
-          "keywords": [],
-          "license": "MIT",
-          "license_file": null,
-          "links": null,
-          "name": "foo",
-          "readme": null,
-          "readme_file": null,
-          "repository": "foo",
-          "rust_version": null,
-          "vers": "0.1.0"
-        }
-        "#,
-        "foo-0.1.0.crate",
-        &["Cargo.lock", "Cargo.toml", "Cargo.toml.orig", "src/main.rs"],
-        &[(
-            "Cargo.toml",
-            &format!(
-                r#"{}
-[package]
-edition = "2015"
-name = "foo"
-version = "0.1.0"
-authors = []
-description = "foo"
-homepage = "foo"
-documentation = "foo"
-license = "MIT"
-repository = "foo"
-
-[dev-dependencies]
-
-[features]
-foo_feature = []
-"#,
-                cargo::core::package::MANIFEST_PREAMBLE
-            ),
-        )],
-    );
 }
 #[cargo_test]
 fn credentials_ambiguous_filename() {