Flatten tests into main crate

dtolnay · May 7, 2019 · e482e84 · e482e84
1 parent 99b86c7
commit e482e84
Show file tree

Hide file tree

Showing 21 changed files with 6 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,15 +10,12 @@ matrix:
       name: Stable compiletest
     - rust: nightly
       name: Unstable compiletest
-      env: FEATURES="unstable" TEST_FEATURES="unstable"
+      env: FEATURES="unstable"
     - rust: nightly
       name: Minimal versions
       before_script:
         - cargo update -Z minimal-versions
 
 script:
   - cargo build --features "${FEATURES:-}"
-  - cargo clean
   - cargo test --features "${FEATURES:-}"
-  - cargo clean
-  - cargo test --features "${TEST_FEATURES:-}" --manifest-path tests/Cargo.toml
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,8 +17,12 @@ unstable = ["indoc-impl/unstable"]
 indoc-impl = { version = "=0.3.3", path = "impl" }
 proc-macro-hack = "0.5.3"
 
+[dev-dependencies]
+select-rustc = "0.1"
+trybuild = "1.0"
+
 [workspace]
-members = ["impl", "tests", "unindent"]
+members = ["impl", "unindent"]
 
 [badges]
 travis-ci = { repository = "dtolnay/indoc" }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
diff --git a/tests/tests/compiletest.rs → tests/compiletest.rs b/tests/tests/compiletest.rs → tests/compiletest.rs
diff --git a/tests/tests/run-pass.rs → tests/run-pass.rs b/tests/tests/run-pass.rs → tests/run-pass.rs
diff --git a/tests/tests/ui-stable/no-arguments.rs → tests/ui-stable/no-arguments.rs b/tests/tests/ui-stable/no-arguments.rs → tests/ui-stable/no-arguments.rs
diff --git a/tests/tests/ui-stable/no-arguments.stderr → tests/ui-stable/no-arguments.stderr b/tests/tests/ui-stable/no-arguments.stderr → tests/ui-stable/no-arguments.stderr
diff --git a/tests/tests/ui-stable/non-lit.rs → tests/ui-stable/non-lit.rs b/tests/tests/ui-stable/non-lit.rs → tests/ui-stable/non-lit.rs
diff --git a/tests/tests/ui-stable/non-lit.stderr → tests/ui-stable/non-lit.stderr b/tests/tests/ui-stable/non-lit.stderr → tests/ui-stable/non-lit.stderr
diff --git a/tests/tests/ui-stable/non-string.rs → tests/ui-stable/non-string.rs b/tests/tests/ui-stable/non-string.rs → tests/ui-stable/non-string.rs
diff --git a/tests/tests/ui-stable/non-string.stderr → tests/ui-stable/non-string.stderr b/tests/tests/ui-stable/non-string.stderr → tests/ui-stable/non-string.stderr
diff --git a/tests/tests/ui-stable/two-arguments.rs → tests/ui-stable/two-arguments.rs b/tests/tests/ui-stable/two-arguments.rs → tests/ui-stable/two-arguments.rs
diff --git a/tests/tests/ui-stable/two-arguments.stderr → tests/ui-stable/two-arguments.stderr b/tests/tests/ui-stable/two-arguments.stderr → tests/ui-stable/two-arguments.stderr
diff --git a/tests/tests/ui-unstable/no-arguments.rs → tests/ui-unstable/no-arguments.rs b/tests/tests/ui-unstable/no-arguments.rs → tests/ui-unstable/no-arguments.rs
diff --git a/tests/tests/ui-unstable/no-arguments.stderr → tests/ui-unstable/no-arguments.stderr b/tests/tests/ui-unstable/no-arguments.stderr → tests/ui-unstable/no-arguments.stderr
diff --git a/tests/tests/ui-unstable/non-lit.rs → tests/ui-unstable/non-lit.rs b/tests/tests/ui-unstable/non-lit.rs → tests/ui-unstable/non-lit.rs
diff --git a/tests/tests/ui-unstable/non-lit.stderr → tests/ui-unstable/non-lit.stderr b/tests/tests/ui-unstable/non-lit.stderr → tests/ui-unstable/non-lit.stderr
diff --git a/tests/tests/ui-unstable/non-string.rs → tests/ui-unstable/non-string.rs b/tests/tests/ui-unstable/non-string.rs → tests/ui-unstable/non-string.rs
diff --git a/tests/tests/ui-unstable/non-string.stderr → tests/ui-unstable/non-string.stderr b/tests/tests/ui-unstable/non-string.stderr → tests/ui-unstable/non-string.stderr
diff --git a/tests/tests/ui-unstable/two-arguments.rs → tests/ui-unstable/two-arguments.rs b/tests/tests/ui-unstable/two-arguments.rs → tests/ui-unstable/two-arguments.rs
diff --git a/tests/tests/ui-unstable/two-arguments.stderr → tests/ui-unstable/two-arguments.stderr b/tests/tests/ui-unstable/two-arguments.stderr → tests/ui-unstable/two-arguments.stderr