tests: make the remaning fastmodels boot tests run automated

Signed-off-by: Reto Achermann <[email protected]>
ubc-systopia · Dec 7, 2024 · 56b394a · 56b394a
1 parent 9a24f8d
commit 56b394a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/examples/multisegment.vrs b/examples/multisegment.vrs
@@ -63,7 +63,7 @@ segment SingleSegment(base : addr) {
     fn translate(va: vaddr) -> paddr
         requires va < PAGE_SIZE
     {
-        va + state.seg.address << 4
+        va + (state.seg.address << 4)
     }
 
     synth fn map(va: vaddr, sz: size, flgs: flags, pa : paddr)

diff --git a/examples/x86_32_pagetable.vrs b/examples/x86_32_pagetable.vrs
@@ -309,7 +309,7 @@ segment X8632PageDirectoryEntryTable(base : paddr) {
     fn translate(va: vaddr) -> paddr
         requires state.entry.pagesize == 0
     {
-        va + (state.entry.address << 12)
+        (state.entry.address << 12)
     }
 
     // unmapping an entry

diff --git a/tests/fastmodels.rs b/tests/fastmodels.rs
@@ -437,11 +437,18 @@ fn run_fastmodels(vrs: &Path, outdir: &Path, bootimg: Option<&Path>) {
     );
 
     expect_output(&mut p, &mut output, r"\[ARMv8\]: Running VRS tests for:");
-    expect_output(
-        &mut p,
-        &mut output,
-        r"\[ARMv8\]: Velosiraptor tests completed.",
-    );
+
+
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Reconfigure..");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Writing memory");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Reconfigure..");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Writing memory..");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Verifying memory...");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Verifying memory...");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: All memory mapped correctly");
+    expect_output(&mut p, &mut output, r"\[ARMv8\]: Velosiraptor tests completed.");
+
+    println!(" -- OK! Simulator completed successfully.");
 
     let _ = p.send_control('c');
     let _ = p.process.kill(SIGKILL);