diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 1 | ||||
| -rwxr-xr-x | gdb/gdbserver/configure | 3 | ||||
| -rw-r--r-- | gdb/gdbserver/configure.ac | 3 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 8 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.server/unittest.exp | 13 |
7 files changed, 37 insertions, 6 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b9757c3..32a5157 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,13 @@ +2018-01-08 Yao Qi <yao.qi@linaro.org> + Simon Marchi <simon.marchi@ericsson.com> + + * Makefile.in (OBS): Remove selftest.o. + * configure.ac: Set srv_selftest_objs if $development is true. + (GDBSERVER_DEPFILES): Append $srv_selftest_objs. + * configure: Re-generated. + * server.c (captured_main): Wrap variable selftest_filter with + GDB_SELF_TEST. + 2018-01-07 Simon Marchi <simon.marchi@polymtl.ca> * server.c (parse_debug_format_options): Return std::string. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index caa94a6..3ce086d 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -261,7 +261,6 @@ OBS = \ regcache.o \ remote-utils.o \ rsp-low.o \ - selftest.o \ server.o \ signals.o \ signals-state-save-restore.o \ diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 835dcca..ca51321 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -5815,6 +5815,7 @@ fi if $development; then + srv_selftest_objs="selftest.o" $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h @@ -8287,7 +8288,7 @@ $as_echo "#define USE_XML 1" >>confdefs.h done fi -GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs" +GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs $srv_selftest_objs" GDBSERVER_LIBS="$srv_libs" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports __sync_*_compare_and_swap" >&5 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 916384e..7ea3654 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -57,6 +57,7 @@ fi GDB_AC_LIBMCHECK(${libmcheck_default}) if $development; then + srv_selftest_objs="selftest.o" AC_DEFINE(GDB_SELF_TEST, 1, [Define if self-testing features should be enabled]) fi @@ -410,7 +411,7 @@ if test "$srv_xmlfiles" != ""; then done fi -GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs" +GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs $srv_selftest_objs" GDBSERVER_LIBS="$srv_libs" dnl Check whether the target supports __sync_*_compare_and_swap. diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 665d9aa..9d12ce6 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -3559,7 +3559,9 @@ captured_main (int argc, char *argv[]) volatile int attach = 0; int was_running; bool selftest = false; +#if GDB_SELF_TEST const char *selftest_filter = NULL; +#endif while (*next_arg != NULL && **next_arg == '-') { @@ -3683,7 +3685,9 @@ captured_main (int argc, char *argv[]) else if (startswith (*next_arg, "--selftest=")) { selftest = true; +#if GDB_SELF_TEST selftest_filter = *next_arg + strlen ("--selftest="); +#endif } else { @@ -3761,7 +3765,11 @@ captured_main (int argc, char *argv[]) if (selftest) { +#if GDB_SELF_TEST selftests::run_tests (selftest_filter); +#else + printf (_("Selftests are not available in a non-development build.\n")); +#endif throw_quit ("Quit"); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c1223db..71424a9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2018-01-08 Simon Marchi <simon.marchi@ericsson.com> + * gdb.server/unittest.exp: Match the output in non-development + mode. + +2018-01-08 Simon Marchi <simon.marchi@ericsson.com> + * gdb.gdb/unittest.exp: Match output in non-development mode. 2018-01-08 Joel Brobecker <brobecker@adacore.com> diff --git a/gdb/testsuite/gdb.server/unittest.exp b/gdb/testsuite/gdb.server/unittest.exp index 646babc..e947ff2 100644 --- a/gdb/testsuite/gdb.server/unittest.exp +++ b/gdb/testsuite/gdb.server/unittest.exp @@ -30,12 +30,19 @@ set gdbserver_command "$gdbserver --selftest" set server_spawn_id [remote_spawn target $gdbserver_command] +set test "unit tests" gdb_expect { -i $server_spawn_id - -re "Ran $decimal unit tests, 0 failed" { - pass "unit tests" + -re "Ran ($decimal) unit tests, 0 failed" { + set num_ran $expect_out(1,string) + gdb_assert "$num_ran > 0" $test } + + -re "Selftests are not available in a non-development build.\r\n$" { + unsupported $test + } + default { - fail "unit tests" + fail $test } } |