From a8fea70f656416b2ed7d388fbcc7cc6cda126a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
Date: Tue, 29 Aug 2023 17:15:23 +0100
Subject: [PATCH] tests/tcg: clean-up gdb confirm/pagination settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We can do this all in the run-test.py script so remove the extraneous
bits from the individual tests which got copied from the original
non-CI gdb tests.
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230829161528.2707696-8-alex.bennee@linaro.org>
---
tests/guest-debug/run-test.py | 2 ++
tests/tcg/aarch64/gdbstub/test-sve-ioctl.py | 3 ---
tests/tcg/aarch64/gdbstub/test-sve.py | 3 ---
tests/tcg/multiarch/gdbstub/memory.py | 3 ---
tests/tcg/multiarch/gdbstub/sha1.py | 4 ----
tests/tcg/multiarch/gdbstub/test-proc-mappings.py | 4 ----
tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py | 4 ----
tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py | 4 ----
tests/tcg/s390x/gdbstub/test-signals-s390x.py | 4 ----
tests/tcg/s390x/gdbstub/test-svc.py | 4 ----
10 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py
index a032e01f795..b13b27d4b19 100755
--- a/tests/guest-debug/run-test.py
+++ b/tests/guest-debug/run-test.py
@@ -83,6 +83,8 @@ def log(output, msg):
gdb_cmd += " %s" % (args.gdb_args)
# run quietly and ignore .gdbinit
gdb_cmd += " -q -n -batch"
+ # disable pagination
+ gdb_cmd += " -ex 'set pagination off'"
# disable prompts in case of crash
gdb_cmd += " -ex 'set confirm off'"
# connect to remote
diff --git a/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py b/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
index b9ef169c1a0..ee8d467e59d 100644
--- a/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
+++ b/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
@@ -76,9 +76,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
-
# Run the actual tests
run_test()
except:
diff --git a/tests/tcg/aarch64/gdbstub/test-sve.py b/tests/tcg/aarch64/gdbstub/test-sve.py
index ef57c7412cd..afd8ece98dd 100644
--- a/tests/tcg/aarch64/gdbstub/test-sve.py
+++ b/tests/tcg/aarch64/gdbstub/test-sve.py
@@ -66,9 +66,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
-
# Run the actual tests
run_test()
except:
diff --git a/tests/tcg/multiarch/gdbstub/memory.py b/tests/tcg/multiarch/gdbstub/memory.py
index 67864ad9029..dd25e722813 100644
--- a/tests/tcg/multiarch/gdbstub/memory.py
+++ b/tests/tcg/multiarch/gdbstub/memory.py
@@ -115,9 +115,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
-
# Run the actual tests
run_test()
except (gdb.error):
diff --git a/tests/tcg/multiarch/gdbstub/sha1.py b/tests/tcg/multiarch/gdbstub/sha1.py
index 423b720e6da..416728415f9 100644
--- a/tests/tcg/multiarch/gdbstub/sha1.py
+++ b/tests/tcg/multiarch/gdbstub/sha1.py
@@ -73,10 +73,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
- gdb.execute("set confirm off")
-
# Run the actual tests
run_test()
except (gdb.error):
diff --git a/tests/tcg/multiarch/gdbstub/test-proc-mappings.py b/tests/tcg/multiarch/gdbstub/test-proc-mappings.py
index 5e3e5a2fb78..04ec61d2197 100644
--- a/tests/tcg/multiarch/gdbstub/test-proc-mappings.py
+++ b/tests/tcg/multiarch/gdbstub/test-proc-mappings.py
@@ -51,10 +51,6 @@ def main():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
- gdb.execute("set confirm off")
-
# Run the actual tests
run_test()
except gdb.error:
diff --git a/tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py b/tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py
index d91e8fdf19a..926fa962b77 100644
--- a/tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py
+++ b/tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py
@@ -42,10 +42,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
- gdb.execute("set confirm off")
-
# Run the actual tests
run_test()
except (gdb.error):
diff --git a/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py b/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
index 798d508bc70..e57d2a8db8b 100644
--- a/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
+++ b/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
@@ -45,10 +45,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
- gdb.execute("set confirm off")
-
# Run the actual tests
run_test()
except (gdb.error):
diff --git a/tests/tcg/s390x/gdbstub/test-signals-s390x.py b/tests/tcg/s390x/gdbstub/test-signals-s390x.py
index 80a284b4751..ca2bbc0b03e 100644
--- a/tests/tcg/s390x/gdbstub/test-signals-s390x.py
+++ b/tests/tcg/s390x/gdbstub/test-signals-s390x.py
@@ -61,10 +61,6 @@ def run_test():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
- gdb.execute("set confirm off")
-
# Run the actual tests
run_test()
except (gdb.error):
diff --git a/tests/tcg/s390x/gdbstub/test-svc.py b/tests/tcg/s390x/gdbstub/test-svc.py
index 18fad3f163d..804705fede9 100644
--- a/tests/tcg/s390x/gdbstub/test-svc.py
+++ b/tests/tcg/s390x/gdbstub/test-svc.py
@@ -49,10 +49,6 @@ def main():
exit(0)
try:
- # These are not very useful in scripts
- gdb.execute("set pagination off")
- gdb.execute("set confirm off")
-
# Run the actual tests
run_test()
except gdb.error:
--
GitLab