Test both duplicating and full-auto code paths

Author: chitoyuu

.github/workflows/full-ci.yml

@@ -281,6 +281,12 @@ jobs:
             godot: "3.5.1-stable"
             postfix: ' (inventory)'
             build_args: '--features inventory'
+          - rust: stable
+            godot: "3.5.1-stable"
+            postfix: ' (inventory)'
+            # Limiting no-manual-register tests to stable as to not slow down CI too far -- if inventory is
+            # working across all 3 Rust versions, this is likely to be as well.
+            build_args: '--features inventory,no-manual-register'
           - rust: nightly
             godot: "3.5.1-stable"
             postfix: ' (nightly)'

check.sh

@@ -63,6 +63,7 @@ function findGodot() {
 }
 
 features="gdnative/async,gdnative/serde,gdnative/inventory"
+itest_toggled_features="no-manual-register"
 cmds=()
 
 for arg in "${args[@]}"; do
@@ -81,6 +82,9 @@ for arg in "${args[@]}"; do
         cmds+=("cargo build --manifest-path test/Cargo.toml --features $features")
         cmds+=("cp target/debug/*gdnative_test* test/project/lib/")
         cmds+=("$godotBin --path test/project")
+        cmds+=("cargo build --manifest-path test/Cargo.toml --features $features,$itest_toggled_features")
+        cmds+=("cp target/debug/*gdnative_test* test/project/lib/")
+        cmds+=("$godotBin --path test/project")
         ;;
     doc)
         cmds+=("cargo doc --lib -p gdnative --no-deps --features $features")

test/Cargo.toml

@@ -16,6 +16,7 @@ type-tag-fallback = ["gdnative/type-tag-fallback"]
 custom-godot = ["gdnative/custom-godot"]
 ptrcall = ["gdnative/ptrcall"]
 inventory = ["gdnative/inventory"]
+no-manual-register = []
 
 [dependencies]
 gdnative = { path = "../gdnative", features = ["gd-test", "serde", "async"] }

test/src/lib.rs

@@ -236,14 +236,14 @@ godot_itest! { test_from_instance_id {
     assert!(unsafe { Reference::try_from_instance_id(instance_id).is_none() });
 }}
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 fn init(handle: InitHandle) {
     handle.add_class::<Foo>();
     handle.add_class::<OptionalArgs>();
     delegate_init(handle);
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 fn init(handle: InitHandle) {
     delegate_init(handle);
 }

test/src/test_as_arg.rs

@@ -4,12 +4,12 @@ use gdnative::prelude::*;
 use std::mem::MaybeUninit;
 use std::ops::Deref;
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<MyNode>();
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 pub(crate) fn register(_handle: InitHandle) {}
 
 pub(crate) fn run_tests() -> bool {

test/src/test_async.rs

@@ -13,7 +13,7 @@ thread_local! {
     };
 }
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 pub(crate) fn register(handle: InitHandle) {
     gdnative::tasks::register_runtime(&handle);
     gdnative::tasks::set_executor(EXECUTOR.with(|e| *e));
@@ -22,7 +22,7 @@ pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<AsyncExecutorDriver>();
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 pub(crate) fn register(handle: InitHandle) {
     gdnative::tasks::register_runtime(&handle);
     gdnative::tasks::set_executor(EXECUTOR.with(|e| *e));

test/src/test_derive.rs

@@ -26,7 +26,7 @@ pub(crate) fn run_tests() -> bool {
     status
 }
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<MinimalDerive>();
     handle.add_class::<EmplacementOnly>();
@@ -40,7 +40,7 @@ pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<MyVec>();
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 pub(crate) fn register(_handle: InitHandle) {}
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------

test/src/test_free_ub.rs

@@ -10,12 +10,12 @@ pub(crate) fn run_tests() -> bool {
     status
 }
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<Bar>();
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 pub(crate) fn register(_handle: InitHandle) {}
 
 #[derive(NativeClass)]

test/src/test_generic_class.rs

@@ -7,13 +7,13 @@ pub(crate) fn run_tests() -> bool {
     true
 }
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<IntOps>();
     handle.add_class::<StrOps>();
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 pub(crate) fn register(_handle: InitHandle) {}
 
 #[derive(NativeClass)]

test/src/test_map_owned.rs

@@ -9,12 +9,12 @@ pub(crate) fn run_tests() -> bool {
     status
 }
 
-#[cfg(not(feature = "inventory"))]
+#[cfg(not(feature = "no-manual-register"))]
 pub(crate) fn register(handle: InitHandle) {
     handle.add_class::<VecBuilder>();
 }
 
-#[cfg(feature = "inventory")]
+#[cfg(feature = "no-manual-register")]
 pub(crate) fn register(_handle: InitHandle) {}
 
 #[derive(NativeClass)]