Update UI tests

Update tests with the added `glam` dependency. Run tests that depend on Span::join only on nightly.
godot-rust · Mar 30, 2021 · 1d2be53 · 1d2be53
1 parent fce0a9b
commit 1d2be53
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/gdnative/Cargo.toml b/gdnative/Cargo.toml
@@ -26,6 +26,7 @@ gdnative-bindings = { optional = true, path = "../gdnative-bindings", version =
 
 [dev-dependencies]
 trybuild = "1.0"
+rustversion = "1.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/gdnative/tests/ui.rs b/gdnative/tests/ui.rs
@@ -20,19 +20,39 @@ fn ui_tests() {
 
     // ToVariant
     t.compile_fail("tests/ui/to_variant_fail_01.rs");
-    t.compile_fail("tests/ui/to_variant_fail_02.rs");
-    t.compile_fail("tests/ui/to_variant_fail_03.rs");
+    to_variant_ui_path(&t);
     t.compile_fail("tests/ui/to_variant_fail_04.rs");
     t.compile_fail("tests/ui/to_variant_fail_05.rs");
     t.compile_fail("tests/ui/to_variant_fail_06.rs");
     t.compile_fail("tests/ui/to_variant_fail_07.rs");
 
     // FromVariant
     t.compile_fail("tests/ui/from_variant_fail_01.rs");
-    t.compile_fail("tests/ui/from_variant_fail_02.rs");
-    t.compile_fail("tests/ui/from_variant_fail_03.rs");
+    from_variant_ui_path(&t);
     t.compile_fail("tests/ui/from_variant_fail_04.rs");
     t.compile_fail("tests/ui/from_variant_fail_05.rs");
     t.compile_fail("tests/ui/from_variant_fail_06.rs");
     t.compile_fail("tests/ui/from_variant_fail_07.rs");
 }
+
+// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
+#[rustversion::not(nightly)]
+fn to_variant_ui_path(_t: &trybuild::TestCases) {}
+
+// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
+#[rustversion::nightly]
+fn to_variant_ui_path(t: &trybuild::TestCases) {
+    t.compile_fail("tests/ui/to_variant_fail_02.rs");
+    t.compile_fail("tests/ui/to_variant_fail_03.rs");
+}
+
+// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
+#[rustversion::not(nightly)]
+fn from_variant_ui_path(_t: &trybuild::TestCases) {}
+
+// FIXME(rust/issues/54725): Full path spans are only available on nightly as of now
+#[rustversion::nightly]
+fn from_variant_ui_path(t: &trybuild::TestCases) {
+    t.compile_fail("tests/ui/from_variant_fail_02.rs");
+    t.compile_fail("tests/ui/from_variant_fail_03.rs");
+}
diff --git a/gdnative/tests/ui/derive_fail_methods_missing_new.stderr b/gdnative/tests/ui/derive_fail_methods_missing_new.stderr
@@ -13,13 +13,11 @@ error[E0599]: no function or associated item named `new` found for struct `Foo`
           candidate #2: `gdnative::GodotObject`
           candidate #3: `PtrWrapper`
           candidate #4: `glam::core::traits::matrix::Matrix2x2`
-          candidate #5: `glam::core::traits::matrix::Matrix3x3`
-          candidate #6: `glam::core::traits::matrix::Matrix4x4`
-          candidate #7: `glam::core::traits::vector::MaskVector2`
-          candidate #8: `glam::core::traits::vector::MaskVector3`
-          candidate #9: `glam::core::traits::vector::MaskVector4`
-          candidate #10: `glam::core::traits::vector::Vector2`
-          candidate #11: `glam::core::traits::vector::Vector3`
-          candidate #12: `glam::core::traits::vector::Vector4`
-          candidate #13: `parking_lot_core::thread_parker::ThreadParkerT`
+          candidate #5: `glam::core::traits::vector::MaskVector2`
+          candidate #6: `glam::core::traits::vector::MaskVector3`
+          candidate #7: `glam::core::traits::vector::MaskVector4`
+          candidate #8: `glam::core::traits::vector::Vector2`
+          candidate #9: `glam::core::traits::vector::Vector3`
+          candidate #10: `glam::core::traits::vector::Vector4`
+          candidate #11: `parking_lot_core::thread_parker::ThreadParkerT`
   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)