Skip to content

Commit 582b1e5

Browse files
authored
Try #115:
2 parents 2cc2ea0 + 705e503 commit 582b1e5

File tree

6 files changed

+20
-185
lines changed

6 files changed

+20
-185
lines changed

.cargo/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[unstable]
22
build-std = ["core", "alloc"]
3+
build-std-features = ["compiler-builtins-mem"]
34

45
[build]
56
target = "x86_64-unknown-hermit-kernel"

.github/workflows/experimental.yml renamed to .github/workflows/nightly.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Tests (experimental)
1+
name: Tests (nightly)
22

33
on:
44
pull_request:
@@ -10,11 +10,11 @@ on:
1010

1111
jobs:
1212
build:
13-
name: Tests (experimental)
13+
name: Tests
1414
runs-on: ${{ matrix.os }}
1515
# these tests based on the nightly compiler, which can be broken
1616
# consequently, we continue on an error
17-
continue-on-error: true
17+
#continue-on-error: true
1818

1919
strategy:
2020
matrix:
@@ -31,7 +31,7 @@ jobs:
3131
targets: 'x86_64-pc-windows-msvc'
3232
- os: ubuntu-latest
3333
rust: 'nightly'
34-
components: 'rust-src, llvm-tools-preview, rustfmt'
34+
components: 'rust-src, llvm-tools-preview'
3535
targets: 'x86_64-unknown-linux-gnu'
3636

3737

@@ -116,8 +116,12 @@ jobs:
116116
qemu-system-x86_64 -display none -smp 2 -m 64M -serial stdio -kernel loader/target/x86_64-unknown-hermit-loader/debug/rusty-loader -initrd target/x86_64-unknown-hermit/release/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr
117117
timeout-minutes: 20
118118
- name: Integration Tests
119+
working-directory: libhermit-rs
119120
run:
120121
cargo test --tests --no-fail-fast -Z build-std=core,alloc --target x86_64-unknown-hermit-kernel -- --bootloader_path=../loader/target/x86_64-unknown-hermit-loader/debug/rusty-loader
122+
if: ${{ matrix.os == 'ubuntu-latest' }}
121123
- name: Integration Tests (smp)
124+
working-directory: libhermit-rs
122125
run:
123126
cargo test --tests --no-fail-fast -Z build-std=core,alloc --target x86_64-unknown-hermit-kernel -- --bootloader_path=../loader/target/x86_64-unknown-hermit-loader/debug/rusty-loader --num_cores 2
127+
if: ${{ matrix.os == 'ubuntu-latest' }}

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bors.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
status = [
22
"Tests",
3+
"Tests (macOS-latest, nightly)",
4+
"Tests (windows-latest, nightly)",
5+
"Tests (ubuntu-latest, nightly)",
36
"Format check (ubuntu-latest, nightly)",
47
"continuous-integration/travis-ci/push"
58
]

src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ pub mod environment;
9595
mod errno;
9696
mod kernel_message_buffer;
9797
mod mm;
98-
#[cfg(not(feature = "newlib"))]
99-
mod rlib;
10098
#[cfg(target_os = "hermit")]
10199
mod runtime_glue;
102100
mod scheduler;

src/rlib.rs

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

0 commit comments

Comments
 (0)