Fix tests

.cargo/config.toml

@@ -0,0 +1,5 @@
+[target.aarch64-apple-darwin]
+runner = "./test-runner.sh"
+
+[target.x86_64-apple-darwin]
+runner = "./test-runner.sh"

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+
+name: Build
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    name: Test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install toolchain from rust-toolchain.toml
+      run: rustup show
+    - name: Install missing targets
+      run: rustup target add aarch64-apple-darwin x86_64-apple-darwin
+    - name: Test
+      run: cargo test --no-fail-fast
+    env:
+      RUST_BACKTRACE: 1

test-runner.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Test runner wrapper that codesigns the test binary before running it
+
+TEST_BINARY="$1"
+shift
+
+# Codesign the test binary on macOS
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    ENTITLEMENTS="$(dirname "$0")/app.entitlements"
+    if [[ -f "$ENTITLEMENTS" ]]; then
+        codesign --entitlements "$ENTITLEMENTS" --force -s - "$TEST_BINARY" 2>/dev/null || true
+    fi
+fi
+
+# Run the test
+exec "$TEST_BINARY" "$@"

tests/hvc.rs

@@ -29,9 +29,9 @@ fn vm_create() {
 		mem[EL1_USER_PAYLOAD_ADDRESS as usize..EL1_USER_PAYLOAD_ADDRESS as usize + sz]
 			.clone_from_slice(&el1_user_payload);
 		//map the vec at address 0
-		map_mem(mem, 0, MemPerm::ExecAndWrite).unwrap();
+		map_mem(mem, 0, MemPerm::ExecWrite).unwrap();
 
-		let vcpu = VirtualCpu::new().unwrap();
+		let vcpu = VirtualCpu::new(0).unwrap();
 
 		vcpu.write_register(Register::CPSR, 0x3c4).unwrap();
 		vcpu.write_register(Register::PC, EL1_USER_PAYLOAD_ADDRESS)