Merge pull request #208 from madsmtm/refactor-tests

Refactor assembly and UI tests

Author: madsmtm

.github/workflows/ci.yml

@@ -149,7 +149,6 @@ jobs:
       CXXFLAGS: ${{ matrix.cflags }}
       ASMFLAGS: ${{ matrix.cflags }}
       LDFLAGS: ${{ matrix.cflags }}
-      HOSTARGS: --no-default-features --features std --features ${{ matrix.runtime || 'apple' }}
       ARGS: --no-default-features --features std --features ${{ matrix.runtime || 'apple' }} ${{ matrix.args }}
       # Use --no-fail-fast, except with dinghy
       TESTARGS: ${{ matrix.dinghy && ' ' || '--no-fail-fast' }} ${{ matrix.test-args }}
@@ -373,8 +372,8 @@ jobs:
       if: ${{ matrix.ui }}
       uses: actions-rs/cargo@v1
       with:
-        command: test
-        args: ${{ env.ARGS }} ${{ env.TESTARGS }} -ptests --features tests/ui --tests ui
+        command: run
+        args: --features=run --bin test-ui
       env:
         # Allow warnings
         RUSTFLAGS: "-C debuginfo=0"
@@ -412,7 +411,7 @@ jobs:
       run:
         export HOST_TARGET=$(rustc -vV | grep host | cut -f2 -d' ')
 
-        cargo run ${{ env.HOSTARGS }} --features assembly --target=$HOST_TARGET test_assembly ${{ env.ARGS }}
+        cargo run --target=$HOST_TARGET --features=run --bin test-assembly -- ${{ env.ARGS }}
 
     - name: Launch XCode Simulator
       if: matrix.dinghy

Cargo.toml

@@ -8,6 +8,8 @@ members = [
     "block2",
     "block-sys",
     "tests",
-    "tests/assembly/*",
+    "test-assembly",
+    "test-assembly/crates/*",
+    "test-ui",
 ]
 resolver = "2"

test-assembly/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "test-assembly"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+repository = "https://github.com/madsmtm/objc2"
+license = "MIT"
+
+build = "build.rs"
+
+[features]
+run = ["cargo_metadata"]
+
+[dependencies]
+cargo_metadata = { version = "0.14", optional = true }

test-assembly/build.rs

@@ -0,0 +1,6 @@
+use std::env;
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rustc-env=TARGET={}", env::var("TARGET").unwrap());
+}