Move ui tests from test_suite/tests/ to tests/

taiki-e · Jul 14, 2019 · 9337f88 · 9337f88
1 parent bf850c3
commit 9337f88
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
       name: cargo test (ui tests)
       script:
         - cargo clean
-        - RUSTFLAGS='--cfg ui_tests' cargo test -p auto_enums_test_suite --all-features --test compile-test
+        - RUSTFLAGS='--cfg ui_tests' cargo test -p auto_enums --all-features --test compile-test
 
     - rust: nightly
       name: cargo check (minimal versions)

diff --git a/Cargo.toml b/Cargo.toml
@@ -28,6 +28,9 @@ travis-ci = { repository = "taiki-e/auto_enums" }
 auto_enums_core = { version = "0.5.8", path = "core", default-features = false }
 auto_enums_derive = { version = "0.5.8", path = "derive", default-features = false }
 
+[dev-dependencies]
+compiletest = { version = "0.3.21", package = "compiletest_rs", features = ["stable", "tmp"] }
+
 [features]
 # Default features.
 default = ["std"]

diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
@@ -10,7 +10,6 @@ futures = { version = "0.1", optional = true }
 quote = { version = "0.6", optional = true }
 rayon = { version = "1.0", optional = true }
 serde = { version = "1.0", optional = true }
-compiletest = { version = "0.3.21", package = "compiletest_rs", optional = true, features = ["stable", "tmp"] }
 
 [dev-dependencies]
 auto_enums = { path = "..", default-features = false, features = ["fmt", "transpose_methods"] }
@@ -40,12 +39,3 @@ unstable = [
     "auto_enums/exact_size_is_empty",
     "auto_enums/try_trait",
 ]
-
-ui_tests = [
-    "compiletest",
-    "std",
-    "unstable",
-    "auto_enums/type_analysis",
-    "auto_enums/transpose_methods",
-    "auto_enums/try_trait",
-]
diff --git a/test_suite/tests/compile-test.rs → tests/compile-test.rs b/test_suite/tests/compile-test.rs → tests/compile-test.rs
@@ -1,5 +1,12 @@
 #![cfg(ui_tests)]
-#![cfg(feature = "unstable")]
+#![cfg(all(
+    feature = "std",
+    feature = "type_analysis",
+    feature = "transpose_methods",
+    feature = "try_trait",
+    feature = "exact_size_is_empty",
+    feature = "read_initializer",
+))]
 
 use std::{env, path::PathBuf};
 

diff --git a/test_suite/tests/ui/auto_enum/args.rs → tests/ui/auto_enum/args.rs b/test_suite/tests/ui/auto_enum/args.rs → tests/ui/auto_enum/args.rs
diff --git a/test_suite/tests/ui/auto_enum/args.stderr → tests/ui/auto_enum/args.stderr b/test_suite/tests/ui/auto_enum/args.stderr → tests/ui/auto_enum/args.stderr
diff --git a/..._suite/tests/ui/auto_enum/compile-fail.rs → tests/ui/auto_enum/compile-fail.rs b/..._suite/tests/ui/auto_enum/compile-fail.rs → tests/ui/auto_enum/compile-fail.rs
diff --git a/...te/tests/ui/auto_enum/compile-fail.stderr → tests/ui/auto_enum/compile-fail.stderr b/...te/tests/ui/auto_enum/compile-fail.stderr → tests/ui/auto_enum/compile-fail.stderr
diff --git a/test_suite/tests/ui/enum_derive/args.rs → tests/ui/enum_derive/args.rs b/test_suite/tests/ui/enum_derive/args.rs → tests/ui/enum_derive/args.rs
diff --git a/test_suite/tests/ui/enum_derive/args.stderr → tests/ui/enum_derive/args.stderr b/test_suite/tests/ui/enum_derive/args.stderr → tests/ui/enum_derive/args.stderr
diff --git a/test_suite/tests/ui/enum_derive/ty_impls.rs → tests/ui/enum_derive/ty_impls.rs b/test_suite/tests/ui/enum_derive/ty_impls.rs → tests/ui/enum_derive/ty_impls.rs
diff --git a/...uite/tests/ui/enum_derive/ty_impls.stderr → tests/ui/enum_derive/ty_impls.stderr b/...uite/tests/ui/enum_derive/ty_impls.stderr → tests/ui/enum_derive/ty_impls.stderr
diff --git a/test_suite/tests/ui/enum_derive/variant.rs → tests/ui/enum_derive/variant.rs b/test_suite/tests/ui/enum_derive/variant.rs → tests/ui/enum_derive/variant.rs
diff --git a/...suite/tests/ui/enum_derive/variant.stderr → tests/ui/enum_derive/variant.stderr b/...suite/tests/ui/enum_derive/variant.stderr → tests/ui/enum_derive/variant.stderr
diff --git a/test_suite/tests/ui/update-all-references.sh → tests/ui/update-all-references.sh b/test_suite/tests/ui/update-all-references.sh → tests/ui/update-all-references.sh
diff --git a/test_suite/tests/ui/update-references.sh → tests/ui/update-references.sh b/test_suite/tests/ui/update-references.sh → tests/ui/update-references.sh
@@ -21,7 +21,7 @@
 
 MYDIR=$(dirname $0)
 
-BUILD_DIR="../../../target/tests/ui"
+BUILD_DIR="../../target/tests/ui"
 
 while [[ "$1" != "" ]]; do
     STDERR_NAME="${1/%.rs/.stderr}"