Merge pull request #477 from mkroening/config-toml

test: replace `x86_64-bare-metal.json` with `x86_64-unknown-none`
rust-osdev · Apr 5, 2024 · b70e8bc · b70e8bc
2 parents b10c098 + d3b9c05
commit b70e8bc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -98,9 +98,8 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@nightly
         with:
+          targets: x86_64-unknown-none
           components: rust-src, llvm-tools
-      - name: "Install cargo-xbuild"
-        run: cargo install cargo-xbuild --debug --root binaries
       - name: "Install bootimage"
         run: cargo install bootimage --debug --root binaries
 
@@ -128,7 +127,7 @@ jobs:
         run: qemu-system-x86_64 --version
 
       - name: "Run Test Framework"
-        run: cargo xtest
+        run: cargo test
         shell: bash
         working-directory: "testing"
 

diff --git a/testing/.cargo/config b/testing/.cargo/config
diff --git a/testing/.cargo/config.toml b/testing/.cargo/config.toml
@@ -0,0 +1,6 @@
+[build]
+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