fixup! Add GDB Linux ARM64 and RISC-V test cases for backtraces.

tmcgilchrist · Jul 4, 2024 · 16d755b · 16d755b
1 parent 4d7ca40
commit 16d755b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 18 deletions.
diff --git a/testsuite/tests/native-debugger/gdb-script b/testsuite/tests/native-debugger/gdb-script
@@ -11,4 +11,5 @@ continue
 backtrace
 continue
 backtrace
+continue
 quit
diff --git a/...e/tests/native-debugger/linux-gdb-test.ml → ...s/native-debugger/linux-gdb-amd64-test.ml b/...e/tests/native-debugger/linux-gdb-test.ml → ...s/native-debugger/linux-gdb-amd64-test.ml
@@ -13,7 +13,7 @@
    debugger_script = "${test_source_directory}/gdb-script";
    gdb;
    script = "sh ${test_source_directory}/sanitize.sh ${test_source_directory} \
-             ${test_build_directory} ${ocamltest_response} linux-gdb-test";
+             ${test_build_directory} ${ocamltest_response} linux-gdb-amd64-test";
    script;
    check-program-output;
  *)
diff --git a/.../native-debugger/linux-gdb-test.reference → ...e-debugger/linux-gdb-amd64-test.reference b/.../native-debugger/linux-gdb-test.reference → ...e-debugger/linux-gdb-amd64-test.reference
@@ -57,8 +57,4 @@ Breakpoint 4, camlMeander.c_to_ocaml_273 () at meander.ml:5
 #13 caml_startup (argv=<optimised out>) at runtime/startup_nat.c:140
 #14 caml_main (argv=<optimised out>) at runtime/startup_nat.c:147
 #15 0x00000000000000 in main (argc=<optimised out>, argv=<optimised out>) at runtime/main.c:37
-A debugging session is active.
-
-	Inferior 1 [process XX] will be killed.
-
-Quit anyway? (y or n) [answered Y;]
+[Inferior 1 (process XXXX) exited normally]
diff --git a/...sts/native-debugger/linux-gdb-arm-test.ml → ...s/native-debugger/linux-gdb-arm64-test.ml b/...sts/native-debugger/linux-gdb-arm-test.ml → ...s/native-debugger/linux-gdb-arm64-test.ml
@@ -13,7 +13,7 @@
    debugger_script = "${test_source_directory}/gdb-script";
    gdb;
    script = "sh ${test_source_directory}/sanitize.sh ${test_source_directory} \
-   ${test_build_directory} ${ocamltest_response} linux-gdb-arm-test";
+   ${test_build_directory} ${ocamltest_response} linux-gdb-arm64-test";
    script;
    check-program-output;
  *)
diff --git a/...ive-debugger/linux-gdb-arm-test.reference → ...e-debugger/linux-gdb-arm64-test.reference b/...ive-debugger/linux-gdb-arm-test.reference → ...e-debugger/linux-gdb-arm64-test.reference
@@ -57,8 +57,4 @@ Breakpoint 4, camlMeander.c_to_ocaml_273 () at meander.ml:5
 #13 caml_startup (argv=<optimized out>) at runtime/startup_nat.c:140
 #14 caml_main (argv=<optimized out>) at runtime/startup_nat.c:147
 #15 0x00000000000000 in main (argc=<optimized out>, argv=<optimized out>) at runtime/main.c:37
-A debugging session is active.
-
-	Inferior 1 [process XX] will be killed.
-
-Quit anyway? (y or n) [answered Y; input not from terminal]
+[Inferior 1 (process XXXX) exited normally]
diff --git a/testsuite/tests/native-debugger/linux-gdb-riscv-test.reference b/testsuite/tests/native-debugger/linux-gdb-riscv-test.reference
@@ -55,8 +55,4 @@ Breakpoint 1, <signal handler called>
 #12 caml_startup (argv=<optimized out>) at runtime/startup_nat.c:140
 #13 caml_main (argv=<optimized out>) at runtime/startup_nat.c:147
 #14 0x00000000000000 in main (argc=<optimized out>, argv=<optimized out>) at runtime/main.c:37
-A debugging session is active.
-
-	Inferior 1 [process XX] will be killed.
-
-Quit anyway? (y or n) [answered Y; input not from terminal]
+[Inferior 1 (process XXXX) exited normally]
diff --git a/testsuite/tests/native-debugger/sanitize.awk b/testsuite/tests/native-debugger/sanitize.awk
@@ -18,7 +18,7 @@
     gsub("Process ([0-9]+)", "Process XXXX")
 
     # Replace debug process forked by gdb
-    gsub("Inferior 1 [process [0-9]+] will be killed.", "Inferior 1 [process XX] will be killed.")
+    gsub("[Inferior 1 (process [0-9]+) exited normally]", "[Inferior 1 (process XXXX) exited normally]")
 
     # Replace architecture identifiers
     gsub("(x86_64)", "$ARCH")