test: replace x86_64-bare-metal.json with x86_64-unknown-none

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
rust-osdev · Apr 5, 2024 · d3b9c05 · d3b9c05
1 parent 2fbdc11
commit d3b9c05
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -98,6 +98,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@nightly
         with:
+          targets: x86_64-unknown-none
           components: rust-src, llvm-tools
       - name: "Install bootimage"
         run: cargo install bootimage --debug --root binaries
@@ -126,7 +127,7 @@ jobs:
         run: qemu-system-x86_64 --version
 
       - name: "Run Test Framework"
-        run: cargo test -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
+        run: cargo test
         shell: bash
         working-directory: "testing"
 

diff --git a/testing/.cargo/config.toml b/testing/.cargo/config.toml
@@ -1,5 +1,6 @@
 [build]
-target = "x86_64-bare-metal.json"
+target = "x86_64-unknown-none"
+rustflags = ["-Crelocation-model=static"]
 
 [target.'cfg(target_os = "none")']
 runner = "bootimage runner"
diff --git a/testing/x86_64-bare-metal.json b/testing/x86_64-bare-metal.json