Rename cbindgen test

Change lib and package name, to make it more clear, which is used.
corrosion-rs · Jan 1, 2025 · 40260c2 · 40260c2
1 parent a639bc1
commit 40260c2
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 7 deletions.
diff --git a/test/cbindgen/CMakeLists.txt b/test/cbindgen/CMakeLists.txt
@@ -1,8 +1,8 @@
-corrosion_tests_add_test(cbindgen_rust2cpp "cpp-exe" TEST_SRC_DIR rust2cpp)
+corrosion_tests_add_test(cbindgen_rust2cpp_auto "cpp-exe" TEST_SRC_DIR auto)
 corrosion_tests_add_test(cbindgen_manual "cpp-exe" TEST_SRC_DIR manual)
 
 
-set_tests_properties(cbindgen_rust2cpp_run_cpp-exe cbindgen_manual_run_cpp-exe
+set_tests_properties(cbindgen_rust2cpp_auto_run_cpp-exe cbindgen_manual_run_cpp-exe
          PROPERTIES PASS_REGULAR_EXPRESSION
         "^add_point Result: Point { x: 100, y: 100 }\r?\n$"
 )

diff --git a/test/cbindgen/rust2cpp/CMakeLists.txt → test/cbindgen/auto/CMakeLists.txt b/test/cbindgen/rust2cpp/CMakeLists.txt → test/cbindgen/auto/CMakeLists.txt
@@ -4,8 +4,8 @@ project(test_project VERSION 0.1.0)
 set(CORROSION_TOOLS_RUST_TOOLCHAIN "stable")
 include(../../test_header.cmake)
 corrosion_import_crate(MANIFEST_PATH rust/Cargo.toml)
-corrosion_experimental_cbindgen(TARGET rust_lib HEADER_NAME "rust-lib.h")
+corrosion_experimental_cbindgen(TARGET the_rust_lib_crate_name HEADER_NAME "rust-lib.h")
 
 add_executable(cpp-exe main.cpp)
 set_property(TARGET cpp-exe PROPERTY CXX_STANDARD 11)
-target_link_libraries(cpp-exe PUBLIC rust_lib)
+target_link_libraries(cpp-exe PUBLIC the_rust_lib_crate_name)
diff --git a/test/cbindgen/rust2cpp/main.cpp → test/cbindgen/auto/main.cpp b/test/cbindgen/rust2cpp/main.cpp → test/cbindgen/auto/main.cpp
diff --git a/test/cbindgen/rust2cpp/rust/Cargo.lock → test/cbindgen/auto/rust/Cargo.lock b/test/cbindgen/rust2cpp/rust/Cargo.lock → test/cbindgen/auto/rust/Cargo.lock
diff --git a/test/cbindgen/rust2cpp/rust/Cargo.toml → test/cbindgen/auto/rust/Cargo.toml b/test/cbindgen/rust2cpp/rust/Cargo.toml → test/cbindgen/auto/rust/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rust-lib"
+name = "the_rust_package_name"
 version = "0.1.0"
 license = "MIT"
 edition = "2018"
@@ -8,3 +8,4 @@ edition = "2018"
 
 [lib]
 crate-type=["staticlib"]
+name = "the_rust_lib_crate_name"
diff --git a/test/cbindgen/rust2cpp/rust/cbindgen.toml → test/cbindgen/auto/rust/cbindgen.toml b/test/cbindgen/rust2cpp/rust/cbindgen.toml → test/cbindgen/auto/rust/cbindgen.toml
diff --git a/test/cbindgen/rust2cpp/rust/src/ffi.rs → test/cbindgen/auto/rust/src/ffi.rs b/test/cbindgen/rust2cpp/rust/src/ffi.rs → test/cbindgen/auto/rust/src/ffi.rs
diff --git a/test/cbindgen/rust2cpp/rust/src/lib.rs → test/cbindgen/auto/rust/src/lib.rs b/test/cbindgen/rust2cpp/rust/src/lib.rs → test/cbindgen/auto/rust/src/lib.rs
diff --git a/...indgen/rust2cpp/rust/src/other_mod/mod.rs → test/cbindgen/auto/rust/src/other_mod/mod.rs b/...indgen/rust2cpp/rust/src/other_mod/mod.rs → test/cbindgen/auto/rust/src/other_mod/mod.rs