Skip to content

Commit

Permalink
Try #115:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] authored Oct 27, 2020
2 parents 2cc2ea0 + 705e503 commit 582b1e5
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 185 deletions.
1 change: 1 addition & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[unstable]
build-std = ["core", "alloc"]
build-std-features = ["compiler-builtins-mem"]

[build]
target = "x86_64-unknown-hermit-kernel"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests (experimental)
name: Tests (nightly)

on:
pull_request:
Expand All @@ -10,11 +10,11 @@ on:

jobs:
build:
name: Tests (experimental)
name: Tests
runs-on: ${{ matrix.os }}
# these tests based on the nightly compiler, which can be broken
# consequently, we continue on an error
continue-on-error: true
#continue-on-error: true

strategy:
matrix:
Expand All @@ -31,7 +31,7 @@ jobs:
targets: 'x86_64-pc-windows-msvc'
- os: ubuntu-latest
rust: 'nightly'
components: 'rust-src, llvm-tools-preview, rustfmt'
components: 'rust-src, llvm-tools-preview'
targets: 'x86_64-unknown-linux-gnu'


Expand Down Expand Up @@ -116,8 +116,12 @@ jobs:
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
timeout-minutes: 20
- name: Integration Tests
working-directory: libhermit-rs
run:
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
if: ${{ matrix.os == 'ubuntu-latest' }}
- name: Integration Tests (smp)
working-directory: libhermit-rs
run:
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
if: ${{ matrix.os == 'ubuntu-latest' }}
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
status = [
"Tests",
"Tests (macOS-latest, nightly)",
"Tests (windows-latest, nightly)",
"Tests (ubuntu-latest, nightly)",
"Format check (ubuntu-latest, nightly)",
"continuous-integration/travis-ci/push"
]
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ pub mod environment;
mod errno;
mod kernel_message_buffer;
mod mm;
#[cfg(not(feature = "newlib"))]
mod rlib;
#[cfg(target_os = "hermit")]
mod runtime_glue;
mod scheduler;
Expand Down
171 changes: 0 additions & 171 deletions src/rlib.rs

This file was deleted.

0 comments on commit 582b1e5

Please sign in to comment.