From 1af17fd9cc3a453e55ce5b8f556c51859bf40363 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 15 Dec 2017 10:45:27 +0000 Subject: [PATCH] Skip 'maintenance check xml-descriptions' if XML is disabled I see the following test failure when gdb is configured without XML support, maintenance check xml-descriptions binutils-gdb/gdb/testsuite/../features warning: Can not parse XML target description; XML support was disabled at compile time^M Tested 29 XML files, 29 failed (gdb) FAIL: gdb.gdb/unittest.exp: maintenance check xml-descriptions ${srcdir}/../features gdb/testsuite: 2017-12-15 Yao Qi * gdb.gdb/unittest.exp: Skip 'maintenance check xml-descriptions' if XML is disabled. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.gdb/unittest.exp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 84ad6d61051..8d52bb9fc6b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-12-15 Yao Qi + + * gdb.gdb/unittest.exp: Skip 'maintenance check xml-descriptions' + if XML is disabled. + 2017-12-15 Xavier Roirand * gdb.ada/same_component_name: New testcase. diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp index 58494e169c5..7d280d14638 100644 --- a/gdb/testsuite/gdb.gdb/unittest.exp +++ b/gdb/testsuite/gdb.gdb/unittest.exp @@ -13,10 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +set do_xml_test [expr ![gdb_skip_xml_test]] + gdb_start gdb_test "maintenance selftest" "Ran $decimal unit tests, 0 failed" -if { ![is_remote host] } { +if { ![is_remote host] && $do_xml_test } { gdb_test "maintenance check xml-descriptions ${srcdir}/../features" \ "Tested $decimal XML files, 0 failed" \ "maintenance check xml-descriptions \${srcdir}/../features" -- 2.30.2