Skip to content

Commit b70e8bc

Browse files
authored
Merge pull request #477 from mkroening/config-toml
test: replace `x86_64-bare-metal.json` with `x86_64-unknown-none`
2 parents b10c098 + d3b9c05 commit b70e8bc

File tree

4 files changed

+8
-23
lines changed

4 files changed

+8
-23
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ jobs:
9898

9999
- uses: dtolnay/rust-toolchain@nightly
100100
with:
101+
targets: x86_64-unknown-none
101102
components: rust-src, llvm-tools
102-
- name: "Install cargo-xbuild"
103-
run: cargo install cargo-xbuild --debug --root binaries
104103
- name: "Install bootimage"
105104
run: cargo install bootimage --debug --root binaries
106105

@@ -128,7 +127,7 @@ jobs:
128127
run: qemu-system-x86_64 --version
129128

130129
- name: "Run Test Framework"
131-
run: cargo xtest
130+
run: cargo test
132131
shell: bash
133132
working-directory: "testing"
134133

testing/.cargo/config

Lines changed: 0 additions & 5 deletions
This file was deleted.

testing/.cargo/config.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[build]
2+
target = "x86_64-unknown-none"
3+
rustflags = ["-Crelocation-model=static"]
4+
5+
[target.'cfg(target_os = "none")']
6+
runner = "bootimage runner"

testing/x86_64-bare-metal.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)