Remove integrations-tests.rs to avoid re-running integration tests

Author: hunhoffe

doc/src/benchmarking/ArtifactEvaluation.md

@@ -101,7 +101,7 @@ Please follow the given steps to reproduce Figure 3 in the paper.
 To execute the benchmark, run:
 
 ```bash
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_fxmark_bench --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_fxmark_bench --nocapture
 ```
 
 The command runs all NR-FS microbenchmarks and stores the results in a CSV file
@@ -172,7 +172,7 @@ To run the LevelDB benchmark on NrOS execute:
 
 ```bash
 cd $HOME/nrk/kernel
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_leveldb_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_leveldb_benchmark --nocapture
 ```
 
 This step will take ~15-20min. If everything worked, you should see an output like this one at the end:
@@ -229,7 +229,7 @@ To run the throughput benchmark (Figure 5) on NrOS execute:
 
 ```bash
 cd $HOME/nrk/kernel
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_benchmark --nocapture
 ```
 
 This step will take ~3min. If everything worked, you should see an output like this one at the end:
@@ -246,7 +246,7 @@ The results will be stored in `vmops_benchmark.csv`.
 To run the latency benchmark (Figure 6a) on NrOS execute:
 
 ```bash
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_latency_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_latency_benchmark --nocapture
 ```
 
 This step will take ~2min. If everything worked, you should see an output like this one at the end:
@@ -264,7 +264,7 @@ To run the unmap latency benchmark (Figure 6c) on NrOS execute:
 
 ```bash
 cd $HOME/nrk/kernel
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_unmaplat_latency_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_unmaplat_latency_benchmark --nocapture
 ```
 
 This step will take ~2min. If everything worked, you should see an output like this one at the end:

doc/src/benchmarking/LevelDb.md

@@ -11,7 +11,7 @@ directly:
 
 ```bash
 cd kernel
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_leveldb_benchmark
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_leveldb_benchmark
 ```
 
 This test will run the db-bench binary for LevelDB which runs various benchmarks

doc/src/benchmarking/Memcached.md

@@ -10,7 +10,7 @@ directly:
 
 ```bash
 cd kernel
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_memcached_benchmark
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_memcached_benchmark
 ```
 
 This test will spawn memcached on one, two and four threads and measure

doc/src/benchmarking/Microbenchmarks.md

@@ -9,7 +9,7 @@ benchmark suite. The benchmark code is located at `usr/init/src/fxmark`.
 To run the fxmark benchmarks invoke the following command:
 
 ```bash
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_fxmark_bench --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_fxmark_bench --nocapture
 ```
 
 fxmark supports several different file benchmarks:
@@ -53,10 +53,10 @@ The benchmark code is located at `usr/init/src/vmops/`. To invoke the
 benchmarks, run:
 
 ```bash
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_latency_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_unmaplat_latency_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_shootdown_simple --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_latency_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_unmaplat_latency_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_shootdown_simple --nocapture
 ```
 
 ## Network

doc/src/benchmarking/Redis.md

@@ -19,12 +19,12 @@ directly:
 ```bash
 cd kernel
 # Runs both _virtio and _e1000 redis benchmark tests
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_redis_benchmark
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_redis_benchmark
 ```
 
 ## Launch redis manually
 
-You can also do the steps that the integration-test does manually. We start a
+You can also do the steps that the integration test does manually. We start a
 DHCP server first. The `apparmor teardown` is necessary if you don't have a
 security policy that allows the use of a `dhcpd.conf` at this location.
 

doc/src/development/Testing.md

@@ -27,11 +27,15 @@ To run the unit tests of the kernel:
 To run the integration tests of the kernel:
 
 1. `cd kernel`
-1. `RUST_TEST_THREADS=1 cargo test --test integration-test`
+1. `RUST_TEST_THREADS=1 cargo test --test '*'`
 
 If you would like to run a specific integration test you can pass it with `--`:
 
-1. `RUST_TEST_THREADS=1 cargo test --test integration-test -- userspace_smoke`
+1. `RUST_TEST_THREADS=1 cargo test --test '*' -- userspace_smoke`
+
+If you would like to run a specific set of integration tests, you can specify the file name with `--test`:
+
+1. `RUST_TEST_THREADS=1 cargo test --test s00_core_test`
 
 In case an integration test fails, adding `--nocapture` at the end (needs to
 come after the `--`) will make sure that the underlying `run.py` invocations are
@@ -72,7 +76,7 @@ flags will also choose a different main() function than the one you're seeing
 There is two parts to the integration test.
 
 - The host side (that will go off and spawn a qemu instance) for running the
-  integration tests. It is found in `kernel/tests/integration-test.rs`.
+  integration tests. It is found in `kernel/tests`.
 - The corresponding main functions in the kernel that gets executed for a
   particular example are located at `kernel/src/integration_main.rs`
 
@@ -84,7 +88,7 @@ To add a new integration test the following tests may be necessary:
    `kernel/src/integration_main.rs` with the used feature name as an annotation.
    It may also be possible to re-use an existing xmain function, in that case
    make not of the feature name used to include it.
-1. Add a runner function to `kernel/tests/integration-test.rs` that builds the
+1. Add a runner function to one of the files in `kernel/tests` that builds the
    kernel with the cargo feature runs it and checks the output.
 
 Integration tests are divided into categories and named accordingly (partially
@@ -156,7 +160,7 @@ A fully automated CI test that checks the network using ping is available as
 well, it can be invoked with the following command:
 
 ```bash
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s04_userspace_rumprt_net
+RUST_TEST_THREADS=1 cargo test --test '*' -- s04_userspace_rumprt_net
 ```
 
 ### socat and netcat

kernel/src/integration_tests.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 // Various integration tests that run inside a VM and test different aspects
-// of the kernel. Check `kernel/tests/integration-test.rs` for the host-side
+// of the kernel. Check `kernel/tests/*.rs` for the host-side
 // counterpart.
 
 use crate::arch::debug::shutdown;
@@ -131,7 +131,7 @@ fn timer() {
         }
 
         // Don't change this line without changing
-        // `s01_timer` in integration-tests.rs:
+        // `s01_timer` in s01_kernel_low_tests.rs:
         info!("Setting the timer");
 
         let start = rawtime::Instant::now();
@@ -575,7 +575,7 @@ fn vspace_debug() {
 
 // Careful note: If you change any of the lines order/amount/variable names etc.
 // in this function, you *most likely* have to adjust s02_gdb in
-// `integration-test.rs`.
+// `s02_kernel_low_tests.rs`.
 #[cfg(feature = "integration-test")]
 fn gdb() {
     use log::info;
@@ -720,7 +720,7 @@ fn vmxnet_smoltcp() {
     let mut tcp_6970_active = false;
     let mut done = false;
     let clock = Clock::new();
-    // Don't change the next line without changing `integration-test.rs`
+    // Don't change the next line without changing `s03_kernel_high_tests.rs`
     info!("About to serve sockets!");
 
     while !done && clock.elapsed() < Instant::from_millis(25_000) {

kernel/src/main.rs

@@ -94,7 +94,7 @@ mod integration_tests;
 /// to exit the VM and communicate the status to the host.
 ///
 /// # Notes
-/// If this type is modified, update the `run.py` script and `tests/integration-test.rs` as well.
+/// If this type is modified, update the `run.py` script and `testutils/*.rs` as well.
 #[derive(Copy, Clone, Debug)]
 #[repr(u8)]
 pub(crate) enum ExitReason {

kernel/tests/integration-test.rs

@@ -13,12 +13,12 @@ rm -f fxmark_benchmark.csv
 rm -f leveldb_benchmark.csv
 
 # For vmops: --features prealloc can improve performance further (at the expense of test duration)
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_vmops_latency_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_redis_benchmark_ --nocapture
-#RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_memcached_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_leveldb_benchmark --nocapture
-RUST_TEST_THREADS=1 cargo test --test integration-test -- s10_fxmark_bench --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_vmops_latency_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_redis_benchmark_ --nocapture
+#RUST_TEST_THREADS=1 cargo test --test s10* -- s10_memcached_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_leveldb_benchmark --nocapture
+RUST_TEST_THREADS=1 cargo test --test s10* -- s10_fxmark_bench --nocapture
 
 # Clone repo
 rm -rf gh-pages