Merge pull request #10 from bearcove/compat

Add opt-in compatibility tests

.github/workflows/test.yml

@@ -22,16 +22,11 @@ jobs:
           toolchain: stable
           profile: minimal
           override: true
-      - name: Run cargo command
+      - name: Add nightly
+        run: rustup toolchain add nightly
+      - name: Run tests runner
         run: |
-          cargo run --manifest-path test-crates/bin/Cargo.toml
+          cd tests/
+          cargo run
+        shell: bash
         continue-on-error: ${{ matrix.os == 'windows-latest' }}
-      - name: Run cargo command (release)
-        run: |
-          cargo run --manifest-path test-crates/bin/Cargo.toml --release
-        continue-on-error: ${{ matrix.os == 'windows-latest' }}
-      - name: Run cargo command (release with SOPRINTLN=1)
-        if: matrix.os != 'windows-latest'
-        run: |
-          export SOPRINTLN=1
-          cargo run --manifest-path test-crates/bin/Cargo.toml --release

Justfile

@@ -3,5 +3,16 @@
 check:
     cargo hack --each-feature --exclude-all-features clippy --manifest-path rubicon/Cargo.toml
 
-test:
-    SOPRINTLN=1 cargo run --manifest-path test-crates/bin/Cargo.toml
+test *args:
+    #!/usr/bin/env bash -eux
+    BIN_CHANNEL="${BIN_CHANNEL:-stable}"
+    BIN_FLAGS="${BIN_FLAGS:-}"
+
+    SOPRINTLN=1 cargo "+${BIN_CHANNEL}" build --manifest-path test-crates/samplebin/Cargo.toml ${BIN_FLAGS}
+
+    export DYLD_LIBRARY_PATH=$(rustc "+stable" --print sysroot)/lib
+    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$(rustc "+nightly" --print sysroot)/lib
+    export LD_LIBRARY_PATH=$(rustc "+stable" --print sysroot)/lib
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(rustc "+nightly" --print sysroot)/lib
+
+    ./test-crates/samplebin/target/debug/samplebin {{args}}

rubicon/Cargo.toml

@@ -14,9 +14,15 @@ keywords = ["ffi", "thread-local"]
 crate-type = ["dylib"]
 
 [dependencies]
+ctor = { version = "0.2.8", optional = true }
+libc = { version = "0.2.155", optional = true }
 paste = { version = "1.0.15", optional = true }
 
+[build-dependencies]
+rustc_version = { version = "0.4.0", optional = true }
+
 [features]
 default = []
-export-globals = ["dep:paste"]
-import-globals = ["dep:paste"]
+export-globals = ["dep:paste", "dep:rustc_version"]
+import-globals = ["dep:paste", "dep:rustc_version", "dep:ctor", "dep:libc"]
+ctor = ["dep:ctor"]

rubicon/build.rs

@@ -0,0 +1,14 @@
+fn main() {
+    #[cfg(any(feature = "export-globals", feature = "import-globals"))]
+    {
+        use std::env;
+
+        // Get the Rust compiler version and set it as an environment variable.
+        let rustc_version = rustc_version::version().unwrap();
+        println!("cargo:rustc-env=RUBICON_RUSTC_VERSION={}", rustc_version);
+
+        // Pass the target triple.
+        let target = env::var("TARGET").unwrap();
+        println!("cargo:rustc-env=RUBICON_TARGET_TRIPLE={}", target);
+    }
+}