From d8641e139e87d54cef5f549121b2a55bf0733ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Wed, 27 Jul 2022 19:37:09 +0200
Subject: [PATCH] Fix integration tests
---
.github/workflows/x86.yml | 3 +--
src/arch/x86_64/kernel/mod.rs | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/x86.yml b/.github/workflows/x86.yml
index 2f4a89389..6a357f517 100644
--- a/.github/workflows/x86.yml
+++ b/.github/workflows/x86.yml
@@ -81,8 +81,7 @@ jobs:
- name: Integration tests (ubuntu)
working-directory: libhermit-rs
if: ${{ matrix.os == 'ubuntu-latest' }}
- run: cargo test --tests --no-fail-fast -- --bootloader_path=rusty-loader-x86_64
- continue-on-error: true
+ run: cargo test --tests --no-fail-fast --target x86_64-unknown-none -- --bootloader_path=../rusty-loader-x86_64
- name: Build release profile
run: cargo build -Zbuild-std=core,alloc,std,panic_abort -Zbuild-std-features=compiler-builtins-mem --target x86_64-unknown-hermit --release
- name: Test release profile
diff --git a/src/arch/x86_64/kernel/mod.rs b/src/arch/x86_64/kernel/mod.rs
index 9510b092f..584e8c94b 100644
--- a/src/arch/x86_64/kernel/mod.rs
+++ b/src/arch/x86_64/kernel/mod.rs
@@ -30,7 +30,7 @@ pub mod pit;
pub mod processor;
pub mod scheduler;
pub mod serial;
-#[cfg(not(test))]
+#[cfg(target_os = "none")]
mod start;
pub mod switch;
pub mod systemtime;
--
GitLab