From f821878623bb86d38e6c1579799038f495d09b61 Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Fri, 26 Feb 2021 14:34:04 +0000 Subject: [PATCH] testsuite: Remove extra \n from expected output of tsv notifications Commit 2450ad54 removed extra trailing \n from tsv notifications but did not update gdb.trace/mi-tsv-changed.exp accordingly. This commit removes the extra \n from expected output so gdb.trace/mi-tsv-changed.exp passes again. gdb/testsuite/ChangeLog: * gdb.trace/mi-tsv-changed.exp (test_create_delete_modify_tsv): Remove trailing \n from expected output. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/mi-tsv-changed.exp | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c64ad978e4a..d29f6d4d448 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-02-26 Jan Vrany + + * gdb.trace/mi-tsv-changed.exp (test_create_delete_modify_tsv): + Remove trailing \n from expected output. + 2021-02-26 Markus Metzger * lib/gdb.exp (use_gdb_stub): Extend comment. diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp index c5ec52db86b..b3d01e828a3 100644 --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp @@ -45,7 +45,7 @@ proc test_create_delete_modify_tsv { } { mi_gdb_load ${binfile} mi_gdb_test "tvariable \$tvar1" \ - ".*=tsv-created,name=\"tvar1\",initial=\"0\"\\\\n.*\\^done" \ + ".*=tsv-created,name=\"tvar1\",initial=\"0\".*\\^done" \ "tvariable \$tvar1" mi_gdb_test "tvariable \$tvar1 = 1" \ ".*=tsv-modified,name=\"tvar1\",initial=\"1\".*\\^done" \ @@ -53,18 +53,18 @@ proc test_create_delete_modify_tsv { } { # No "=tsv-modified" notification is emitted, because the initial # value is not changed. mi_gdb_test "tvariable \$tvar1 = 1" \ - ".*\\\$tvar1 = 1\\\\n\"\r\n~\"Trace state .*\\\\n.*\\^done" \ + ".*\\\$tvar1 = 1\\\\n\"\r\n~\"Trace state .*.*\\^done" \ "tvariable \$tvar1 modified without notification" mi_gdb_test "tvariable \$tvar2 = 45" \ - ".*=tsv-created,name=\"tvar2\",initial=\"45\"\\\\n.*\\^done" \ + ".*=tsv-created,name=\"tvar2\",initial=\"45\".*\\^done" \ "tvariable \$tvar2" mi_gdb_test "delete tvariable \$tvar2" \ - ".*=tsv-deleted,name=\"tvar2\"\\\\n.*\\^done" \ + ".*=tsv-deleted,name=\"tvar2\".*\\^done" \ "delete tvariable \$tvar2" mi_gdb_test "delete tvariable" \ - ".*=tsv-deleted\\\\n.*\\^done" \ + ".*=tsv-deleted.*\\^done" \ "delete all tvariables" # Test target supports tracepoints or not. -- 2.30.2