Correct compiletest build issues

rustic-games · Dec 9, 2020 · 58c7af1 · 58c7af1
1 parent 904d0aa
commit 58c7af1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sm/tests/tests.rs b/sm/tests/tests.rs
@@ -15,6 +15,6 @@ fn run_mode(mode: &str) {
 
 #[test]
 fn compile_test() {
-    run_mode("compile-fail");
     run_mode("run-pass");
+    run_mode("compile-fail");
 }
diff --git a/test_suite/tests/compile-fail/macros/sm/private-machine-state.rs b/test_suite/tests/compile-fail/macros/sm/private-machine-state.rs
@@ -13,5 +13,5 @@ fn main() {
     use Lock::*;
 
     let _sm = Machine(Locked);
-    //~^ ERROR expected function, found struct `Machine`
+    //~^ ERROR expected function, tuple struct or tuple variant, found struct `Machine`
 }
diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs
@@ -6,7 +6,7 @@ fn run_mode(mode: &'static str) {
     let mut config = compiletest::Config::default();
 
     config.mode = mode.parse().expect("invalid mode");
-    config.target_rustcflags = Some("-L deps/target/debug/deps".to_owned());
+    config.target_rustcflags = Some("-L ../target/debug -L deps/target/debug/deps".to_owned());
     if let Ok(name) = env::var("TESTNAME") {
         config.filter = Some(name);
     }
@@ -18,6 +18,6 @@ fn run_mode(mode: &'static str) {
 
 #[test]
 fn compile_fail() {
-    run_mode("compile-fail");
     run_mode("run-pass");
+    run_mode("compile-fail");
 }