Merge pull request #5 from informalsystems/erick/fix_nighly

Split divergent tests into nightly and stable

Author: erickpintor

Cargo.lock

@@ -27,3 +27,6 @@ similar    = "2.7"
 
 [dev-dependencies]
 trybuild = { version = "1.0.114", features = ["diff"] }
+
+[build-dependencies]
+version_check = "0.9"

connect/Cargo.toml

@@ -0,0 +1,11 @@
+fn main() {
+    let channel = version_check::Channel::read().expect("Failed to read rustc channel");
+
+    // Allow for the #[cfg(nightly)] config
+    println!("cargo::rustc-check-cfg=cfg(nightly)");
+
+    if channel.is_nightly() {
+        // Enable the #[cfg(nightly)] config
+        println!("cargo:rustc-cfg=nightly");
+    }
+}

connect/build.rs

@@ -4,3 +4,17 @@ fn test_macros() {
     t.pass("tests/macros/*/pass/*.rs");
     t.compile_fail("tests/macros/*/fail/*.rs");
 }
+
+#[test]
+#[cfg(not(nightly))]
+fn test_macros_stable() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/macros/*/fail/stable/*.rs");
+}
+
+#[test]
+#[cfg(nightly)]
+fn test_macros_nightly() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/macros/*/fail/nightly/*.rs");
+}

connect/tests/macros.rs

@@ -2,7 +2,7 @@ error: invalid digit found in string
   --> tests/macros/quint_run/fail/invalid_num.rs:13:46
    |
 13 | #[quint_run(spec = "spec.qnt", max_samples = -666)]
-   |                                              ^
+   |                                              ^^^^
 
 error: expected integer literal
   --> tests/macros/quint_run/fail/invalid_num.rs:18:46

…sts/macros/quint_run/fail/invalid_num.rs …ros/quint_run/fail/nighly/invalid_num.rsconnect/tests/macros/quint_run/fail/invalid_num.rs renamed to connect/tests/macros/quint_run/fail/nighly/invalid_num.rs connect/tests/macros/quint_run/fail/invalid_num.rs renamed to connect/tests/macros/quint_run/fail/nighly/invalid_num.rs

@@ -0,0 +1,23 @@
+use quint_connect::*;
+
+struct TestDriver;
+
+impl Driver for TestDriver {
+    type State = ();
+
+    fn step(&mut self, _step: &Step) -> Result {
+        todo!()
+    }
+}
+
+#[quint_run(spec = "spec.qnt", max_samples = -666)]
+fn test1() -> impl Driver {
+    TestDriver
+}
+
+#[quint_run(spec = "spec.qnt", max_samples = "666")]
+fn test1() -> impl Driver {
+    TestDriver
+}
+
+fn main() {}

…macros/quint_run/fail/invalid_num.stderr …quint_run/fail/nighly/invalid_num.stderrconnect/tests/macros/quint_run/fail/invalid_num.stderr renamed to connect/tests/macros/quint_run/fail/nighly/invalid_num.stderr connect/tests/macros/quint_run/fail/invalid_num.stderr renamed to connect/tests/macros/quint_run/fail/nighly/invalid_num.stderr

@@ -0,0 +1,11 @@
+error: invalid digit found in string
+  --> tests/macros/quint_run/fail/stable/invalid_num.rs:13:46
+   |
+13 | #[quint_run(spec = "spec.qnt", max_samples = -666)]
+   |                                              ^
+
+error: expected integer literal
+  --> tests/macros/quint_run/fail/stable/invalid_num.rs:18:46
+   |
+18 | #[quint_run(spec = "spec.qnt", max_samples = "666")]
+   |                                              ^^^^^

connect/tests/macros/quint_run/fail/stable/invalid_num.rs

@@ -0,0 +1,11 @@
+error: invalid digit found in string
+  --> tests/macros/quint_test/fail/nightly/invalid_num.rs:13:47
+   |
+13 | #[quint_test(spec = "spec.qnt", max_samples = -666)]
+   |                                               ^^^^
+
+error: expected integer literal
+  --> tests/macros/quint_test/fail/nightly/invalid_num.rs:18:47
+   |
+18 | #[quint_test(spec = "spec.qnt", max_samples = "666")]
+   |                                               ^^^^^