mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 10:35:12 +08:00
Fix GDBserver build failure when $development is false
When we set bfd/development.sh:$development to false, GDBserver failed to build, selftest.o: In function `selftests::run_tests(char const*)': binutils-gdb/gdb/gdbserver/../common/selftest.c:97:undefined reference to `selftests::reset()' collect2: error: ld returned 1 exit status selftest.o shouldn't be compiled and linked when $development is false. With this patch, in release mode, GDBserver doesn't nothing with option --selftest, $ ./gdbserver --selftest=foo Selftests are not available in a non-development build. $ ./gdbserver --selftest Selftests are not available in a non-development build. gdb/gdbserver: 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. gdb/testsuite: 2018-01-08 Simon Marchi <simon.marchi@ericsson.com> * gdb.server/unittest.exp: Match the output in non-development mode.
This commit is contained in:
parent
1e5ded6ce6
commit
605fd3c659
@ -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.
|
||||
|
@ -261,7 +261,6 @@ OBS = \
|
||||
regcache.o \
|
||||
remote-utils.o \
|
||||
rsp-low.o \
|
||||
selftest.o \
|
||||
server.o \
|
||||
signals.o \
|
||||
signals-state-save-restore.o \
|
||||
|
3
gdb/gdbserver/configure
vendored
3
gdb/gdbserver/configure
vendored
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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");
|
||||
}
|
||||
|
||||
|
@ -1,3 +1,8 @@
|
||||
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.
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user