f: Use a more specific config

AxisCommunications · Dec 19, 2024 · 182ab18 · 182ab18
1 parent 95d303e
commit 182ab18
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,2 @@
-[target.aarch64-unknown-linux-gnu]
-runner = ["remote-test.sh"]
-
-[target.thumbv7neon-unknown-linux-gnueabihf]
+[target.'cfg(all(not(miri), not(target_arch = "x86_64")))']
 runner = ["remote-test.sh"]
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -41,7 +41,7 @@ COPY .devhost/install-system-packages.sh ./
 RUN ./install-system-packages.sh \
  && rm install-system-packages.sh
 
-ENV PATH=/usr/local/venv/bin:/workspaces/acap-rs/bin:/usr/local/cargo/bin:$PATH \
+ENV PATH=/usr/local/venv/bin:/usr/local/cargo/bin:$PATH \
     CARGO_HOME=/usr/local/cargo \
     RUSTUP_HOME=/usr/local/rustup \
     VIRTUAL_ENV=/usr/local/venv

diff --git a/Makefile b/Makefile
@@ -211,7 +211,6 @@ check_lint:
 ## Check that risky FFI patterns are sound using miri
 check_miri:
 	rustup +nightly component add miri
-	AXIS_DEVICE_IP="" \
 	cargo +nightly miri test \
 		--package ffi_patterns \
 		--target aarch64-unknown-linux-gnu \