Merge pull request #486 from rust-osdev/separate-workspace-for-test-kernels

Move test kernels to a separate workspace

Author: Freax13

.github/workflows/ci.yml

@@ -25,6 +25,9 @@ jobs:
       - uses: r7kamura/[email protected]
       - name: "Run `cargo check`"
         run: cargo check --all-targets --all
+      - name: "Check test kernels"
+        run: cargo check --all
+        working-directory: tests/test_kernels
       - name: "Check docs.rs build"
         run: cargo check
         env:
@@ -89,6 +92,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: r7kamura/[email protected]
       - run: cargo fmt --all -- --check
+      - run: cargo fmt --all -- --check
+        working-directory: tests/test_kernels
 
   clippy:
     name: Clippy
@@ -99,6 +104,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - uses: r7kamura/[email protected]
       - run: cargo clippy --all --all-targets
+      - run: cargo clippy --all
+        working-directory: tests/test_kernels
 
   semver-checks:
     name: Semver Checks

Cargo.lock

@@ -1,5 +1,3 @@
-cargo-features = ["profile-rustflags"]
-
 [package]
 name = "bootloader"
 description = "An experimental x86_64 bootloader that works on both BIOS and UEFI systems."
@@ -19,17 +17,8 @@ members = [
     "bios/stage-*",
     "bios/common",
     "tests/runner",
-    "tests/test_kernels/default_settings",
-    "tests/test_kernels/map_phys_mem",
-    "tests/test_kernels/higher_half",
-    "tests/test_kernels/pie",
-    "tests/test_kernels/lto",
-    "tests/test_kernels/ramdisk",
-    "tests/test_kernels/min_stack",
-    "tests/test_kernels/lower_memory_free",
-    "tests/test_kernels/write_usable_memory",
 ]
-exclude = ["examples/basic", "examples/test_framework"]
+exclude = ["examples/basic", "examples/test_framework", "tests/test_kernels/*"]
 
 [workspace.package]
 # don't forget to update `workspace.dependencies` below
@@ -110,23 +99,6 @@ inherits = "release"
 debug = true
 overflow-checks = true
 
-[profile.lto]
-inherits = "release"
-lto = true
-
-[profile.test.package.test_kernel_higher_half]
-rustflags = [
-    "-C",
-    "link-args=--image-base 0xFFFF800000000000",
-    "-C",
-    "relocation-model=pic",
-    "-C",
-    "code-model=large",
-]
-
-[profile.test.package.test_kernel_min_stack]
-opt-level = 2
-
 [build-dependencies]
 llvm-tools = "0.1.1"
 

Cargo.toml

@@ -6,9 +6,9 @@ use bootloader_test_runner::run_test_kernel;
 fn basic_boot() {
     // build test kernel manually to force-enable link-time optimization
     let mut cmd = Command::new(std::env::var("CARGO").unwrap_or_else(|_| "cargo".into()));
+    cmd.current_dir("tests/test_kernels");
     cmd.arg("build");
     cmd.arg("-p").arg("test_kernel_lto");
-    cmd.arg("--target").arg("x86_64-unknown-none");
     cmd.arg("--profile").arg("lto");
     let status = cmd.status().unwrap();
     assert!(status.success());

tests/lto.rs

@@ -1,2 +1,3 @@
 [build]
 target-dir = "../../target"
+target = "x86_64-unknown-none"

tests/test_kernels/.cargo/config.toml

@@ -0,0 +1,38 @@
+cargo-features = ["profile-rustflags"]
+
+[workspace]
+resolver = "2"
+members = [
+    "default_settings",
+    "map_phys_mem",
+    "higher_half",
+    "pie",
+    "lto",
+    "ramdisk",
+    "min_stack",
+    "lower_memory_free",
+    "write_usable_memory",
+]
+
+[profile.release]
+panic = "abort"
+lto = false
+debug = true
+overflow-checks = true
+
+[profile.lto]
+inherits = "release"
+lto = true
+
+[profile.test.package.test_kernel_higher_half]
+rustflags = [
+    "-C",
+    "link-args=--image-base 0xFFFF800000000000",
+    "-C",
+    "relocation-model=pic",
+    "-C",
+    "code-model=large",
+]
+
+[profile.test.package.test_kernel_min_stack]
+opt-level = 2