
This changes all includes to use the form "common/filename.h" rather than just "filename.h". This was written by a script. gdb/ChangeLog 2019-01-25 Tom Tromey <tom@tromey.com> * xtensa-linux-nat.c: Fix common/ includes. * xml-support.h: Fix common/ includes. * xml-support.c: Fix common/ includes. * x86-linux-nat.c: Fix common/ includes. * windows-nat.c: Fix common/ includes. * varobj.h: Fix common/ includes. * varobj.c: Fix common/ includes. * value.c: Fix common/ includes. * valops.c: Fix common/ includes. * utils.c: Fix common/ includes. * unittests/xml-utils-selftests.c: Fix common/ includes. * unittests/utils-selftests.c: Fix common/ includes. * unittests/unpack-selftests.c: Fix common/ includes. * unittests/tracepoint-selftests.c: Fix common/ includes. * unittests/style-selftests.c: Fix common/ includes. * unittests/string_view-selftests.c: Fix common/ includes. * unittests/scoped_restore-selftests.c: Fix common/ includes. * unittests/scoped_mmap-selftests.c: Fix common/ includes. * unittests/scoped_fd-selftests.c: Fix common/ includes. * unittests/rsp-low-selftests.c: Fix common/ includes. * unittests/parse-connection-spec-selftests.c: Fix common/ includes. * unittests/optional-selftests.c: Fix common/ includes. * unittests/offset-type-selftests.c: Fix common/ includes. * unittests/observable-selftests.c: Fix common/ includes. * unittests/mkdir-recursive-selftests.c: Fix common/ includes. * unittests/memrange-selftests.c: Fix common/ includes. * unittests/memory-map-selftests.c: Fix common/ includes. * unittests/lookup_name_info-selftests.c: Fix common/ includes. * unittests/function-view-selftests.c: Fix common/ includes. * unittests/environ-selftests.c: Fix common/ includes. * unittests/copy_bitwise-selftests.c: Fix common/ includes. * unittests/common-utils-selftests.c: Fix common/ includes. * unittests/cli-utils-selftests.c: Fix common/ includes. * unittests/array-view-selftests.c: Fix common/ includes. * ui-file.c: Fix common/ includes. * tui/tui-io.c: Fix common/ includes. * tracepoint.h: Fix common/ includes. * tracepoint.c: Fix common/ includes. * tracefile-tfile.c: Fix common/ includes. * top.h: Fix common/ includes. * top.c: Fix common/ includes. * thread.c: Fix common/ includes. * target/waitstatus.h: Fix common/ includes. * target/waitstatus.c: Fix common/ includes. * target.h: Fix common/ includes. * target.c: Fix common/ includes. * target-memory.c: Fix common/ includes. * target-descriptions.c: Fix common/ includes. * symtab.h: Fix common/ includes. * symfile.c: Fix common/ includes. * stap-probe.c: Fix common/ includes. * spu-linux-nat.c: Fix common/ includes. * sparc-nat.c: Fix common/ includes. * source.c: Fix common/ includes. * solib.c: Fix common/ includes. * solib-target.c: Fix common/ includes. * ser-unix.c: Fix common/ includes. * ser-tcp.c: Fix common/ includes. * ser-pipe.c: Fix common/ includes. * ser-base.c: Fix common/ includes. * selftest-arch.c: Fix common/ includes. * s12z-tdep.c: Fix common/ includes. * rust-exp.y: Fix common/ includes. * rs6000-aix-tdep.c: Fix common/ includes. * riscv-tdep.c: Fix common/ includes. * remote.c: Fix common/ includes. * remote-notif.h: Fix common/ includes. * remote-fileio.h: Fix common/ includes. * remote-fileio.c: Fix common/ includes. * regcache.h: Fix common/ includes. * regcache.c: Fix common/ includes. * record-btrace.c: Fix common/ includes. * python/python.c: Fix common/ includes. * python/py-type.c: Fix common/ includes. * python/py-inferior.c: Fix common/ includes. * progspace.h: Fix common/ includes. * producer.c: Fix common/ includes. * procfs.c: Fix common/ includes. * proc-api.c: Fix common/ includes. * printcmd.c: Fix common/ includes. * ppc-linux-nat.c: Fix common/ includes. * parser-defs.h: Fix common/ includes. * osdata.c: Fix common/ includes. * obsd-nat.c: Fix common/ includes. * nat/x86-linux.c: Fix common/ includes. * nat/x86-linux-dregs.c: Fix common/ includes. * nat/x86-dregs.h: Fix common/ includes. * nat/x86-dregs.c: Fix common/ includes. * nat/ppc-linux.c: Fix common/ includes. * nat/mips-linux-watch.h: Fix common/ includes. * nat/mips-linux-watch.c: Fix common/ includes. * nat/linux-waitpid.c: Fix common/ includes. * nat/linux-ptrace.h: Fix common/ includes. * nat/linux-ptrace.c: Fix common/ includes. * nat/linux-procfs.c: Fix common/ includes. * nat/linux-personality.c: Fix common/ includes. * nat/linux-osdata.c: Fix common/ includes. * nat/linux-namespaces.c: Fix common/ includes. * nat/linux-btrace.h: Fix common/ includes. * nat/linux-btrace.c: Fix common/ includes. * nat/fork-inferior.c: Fix common/ includes. * nat/amd64-linux-siginfo.c: Fix common/ includes. * nat/aarch64-sve-linux-ptrace.c: Fix common/ includes. * nat/aarch64-linux.c: Fix common/ includes. * nat/aarch64-linux-hw-point.h: Fix common/ includes. * nat/aarch64-linux-hw-point.c: Fix common/ includes. * namespace.h: Fix common/ includes. * mips-linux-tdep.c: Fix common/ includes. * minsyms.c: Fix common/ includes. * mi/mi-parse.h: Fix common/ includes. * mi/mi-main.c: Fix common/ includes. * mi/mi-cmd-env.c: Fix common/ includes. * memrange.h: Fix common/ includes. * memattr.c: Fix common/ includes. * maint.h: Fix common/ includes. * maint.c: Fix common/ includes. * main.c: Fix common/ includes. * machoread.c: Fix common/ includes. * location.c: Fix common/ includes. * linux-thread-db.c: Fix common/ includes. * linux-nat.c: Fix common/ includes. * linux-fork.c: Fix common/ includes. * inline-frame.c: Fix common/ includes. * infrun.c: Fix common/ includes. * inflow.c: Fix common/ includes. * inferior.h: Fix common/ includes. * inferior.c: Fix common/ includes. * infcmd.c: Fix common/ includes. * inf-ptrace.c: Fix common/ includes. * inf-child.c: Fix common/ includes. * ia64-linux-nat.c: Fix common/ includes. * i387-tdep.c: Fix common/ includes. * i386-tdep.c: Fix common/ includes. * i386-linux-tdep.c: Fix common/ includes. * i386-linux-nat.c: Fix common/ includes. * i386-go32-tdep.c: Fix common/ includes. * i386-fbsd-tdep.c: Fix common/ includes. * i386-fbsd-nat.c: Fix common/ includes. * guile/scm-type.c: Fix common/ includes. * guile/guile.c: Fix common/ includes. * go32-nat.c: Fix common/ includes. * gnu-nat.c: Fix common/ includes. * gdbthread.h: Fix common/ includes. * gdbarch-selftests.c: Fix common/ includes. * gdb_usleep.c: Fix common/ includes. * gdb_select.h: Fix common/ includes. * gdb_bfd.c: Fix common/ includes. * gcore.c: Fix common/ includes. * fork-child.c: Fix common/ includes. * findvar.c: Fix common/ includes. * fbsd-nat.c: Fix common/ includes. * event-top.c: Fix common/ includes. * event-loop.c: Fix common/ includes. * dwarf2read.c: Fix common/ includes. * dwarf2loc.c: Fix common/ includes. * dwarf2-frame.c: Fix common/ includes. * dwarf-index-cache.c: Fix common/ includes. * dtrace-probe.c: Fix common/ includes. * disasm-selftests.c: Fix common/ includes. * defs.h: Fix common/ includes. * csky-tdep.c: Fix common/ includes. * cp-valprint.c: Fix common/ includes. * cp-support.h: Fix common/ includes. * cp-support.c: Fix common/ includes. * corelow.c: Fix common/ includes. * completer.h: Fix common/ includes. * completer.c: Fix common/ includes. * compile/compile.c: Fix common/ includes. * compile/compile-loc2c.c: Fix common/ includes. * compile/compile-cplus-types.c: Fix common/ includes. * compile/compile-cplus-symbols.c: Fix common/ includes. * command.h: Fix common/ includes. * cli/cli-dump.c: Fix common/ includes. * cli/cli-cmds.c: Fix common/ includes. * charset.c: Fix common/ includes. * build-id.c: Fix common/ includes. * btrace.h: Fix common/ includes. * btrace.c: Fix common/ includes. * breakpoint.h: Fix common/ includes. * breakpoint.c: Fix common/ includes. * ax.h: (enum agent_op): Fix common/ includes. * ax-general.c (struct aop_map): Fix common/ includes. * ax-gdb.c: Fix common/ includes. * auxv.c: Fix common/ includes. * auto-load.c: Fix common/ includes. * arm-tdep.c: Fix common/ includes. * arch/riscv.c: Fix common/ includes. * arch/ppc-linux-common.c: Fix common/ includes. * arch/i386.c: Fix common/ includes. * arch/arm.c: Fix common/ includes. * arch/arm-linux.c: Fix common/ includes. * arch/arm-get-next-pcs.c: Fix common/ includes. * arch/amd64.c: Fix common/ includes. * arch/aarch64.c: Fix common/ includes. * arch/aarch64-insn.c: Fix common/ includes. * arch-utils.c: Fix common/ includes. * amd64-windows-tdep.c: Fix common/ includes. * amd64-tdep.c: Fix common/ includes. * amd64-sol2-tdep.c: Fix common/ includes. * amd64-obsd-tdep.c: Fix common/ includes. * amd64-nbsd-tdep.c: Fix common/ includes. * amd64-linux-tdep.c: Fix common/ includes. * amd64-linux-nat.c: Fix common/ includes. * amd64-fbsd-tdep.c: Fix common/ includes. * amd64-fbsd-nat.c: Fix common/ includes. * amd64-dicos-tdep.c: Fix common/ includes. * amd64-darwin-tdep.c: Fix common/ includes. * agent.c: Fix common/ includes. * ada-lang.h: Fix common/ includes. * ada-lang.c: Fix common/ includes. * aarch64-tdep.c: Fix common/ includes. gdb/gdbserver/ChangeLog 2019-01-25 Tom Tromey <tom@tromey.com> * win32-low.c: Fix common/ includes. * win32-i386-low.c: Fix common/ includes. * tracepoint.c: Fix common/ includes. * thread-db.c: Fix common/ includes. * target.h: Fix common/ includes. * symbol.c: Fix common/ includes. * spu-low.c: Fix common/ includes. * server.h: Fix common/ includes. * server.c: Fix common/ includes. * remote-utils.c: Fix common/ includes. * regcache.h: Fix common/ includes. * regcache.c: Fix common/ includes. * nto-x86-low.c: Fix common/ includes. * notif.h: Fix common/ includes. * mem-break.h: Fix common/ includes. * lynx-low.c: Fix common/ includes. * lynx-i386-low.c: Fix common/ includes. * linux-x86-tdesc-selftest.c: Fix common/ includes. * linux-x86-low.c: Fix common/ includes. * linux-low.c: Fix common/ includes. * inferiors.h: Fix common/ includes. * i387-fp.c: Fix common/ includes. * hostio.c: Fix common/ includes. * hostio-errno.c: Fix common/ includes. * gdbthread.h: Fix common/ includes. * gdbreplay.c: Fix common/ includes. * fork-child.c: Fix common/ includes. * event-loop.c: Fix common/ includes. * ax.c: (enum gdb_agent_op): Fix common/ includes.
253 lines
6.5 KiB
C
253 lines
6.5 KiB
C
/* Unit tests for the cli-utils.c file.
|
|
|
|
Copyright (C) 2018-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "cli/cli-utils.h"
|
|
#include "common/selftest.h"
|
|
|
|
namespace selftests {
|
|
namespace cli_utils {
|
|
|
|
static void
|
|
test_number_or_range_parser ()
|
|
{
|
|
/* Test parsing a simple integer. */
|
|
{
|
|
number_or_range_parser one ("1");
|
|
|
|
SELF_CHECK (!one.finished ());
|
|
SELF_CHECK (one.get_number () == 1);
|
|
SELF_CHECK (one.finished ());
|
|
SELF_CHECK (strcmp (one.cur_tok (), "") == 0);
|
|
}
|
|
|
|
/* Test parsing an integer followed by a non integer. */
|
|
{
|
|
number_or_range_parser one_after ("1 after");
|
|
|
|
SELF_CHECK (!one_after.finished ());
|
|
SELF_CHECK (one_after.get_number () == 1);
|
|
SELF_CHECK (one_after.finished ());
|
|
SELF_CHECK (strcmp (one_after.cur_tok (), "after") == 0);
|
|
}
|
|
|
|
/* Test parsing a range. */
|
|
{
|
|
number_or_range_parser one_three ("1-3");
|
|
|
|
for (int i = 1; i < 4; i++)
|
|
{
|
|
SELF_CHECK (!one_three.finished ());
|
|
SELF_CHECK (one_three.get_number () == i);
|
|
}
|
|
SELF_CHECK (one_three.finished ());
|
|
SELF_CHECK (strcmp (one_three.cur_tok (), "") == 0);
|
|
}
|
|
|
|
/* Test parsing a range followed by a non-integer. */
|
|
{
|
|
number_or_range_parser one_three_after ("1-3 after");
|
|
|
|
for (int i = 1; i < 4; i++)
|
|
{
|
|
SELF_CHECK (!one_three_after.finished ());
|
|
SELF_CHECK (one_three_after.get_number () == i);
|
|
}
|
|
SELF_CHECK (one_three_after.finished ());
|
|
SELF_CHECK (strcmp (one_three_after.cur_tok (), "after") == 0);
|
|
}
|
|
|
|
/* Test a negative integer gives an error. */
|
|
{
|
|
number_or_range_parser minus_one ("-1");
|
|
|
|
SELF_CHECK (!minus_one.finished ());
|
|
TRY
|
|
{
|
|
minus_one.get_number ();
|
|
SELF_CHECK (false);
|
|
}
|
|
CATCH (ex, RETURN_MASK_ERROR)
|
|
{
|
|
SELF_CHECK (ex.reason == RETURN_ERROR);
|
|
SELF_CHECK (ex.error == GENERIC_ERROR);
|
|
SELF_CHECK (strcmp (ex.message, "negative value") == 0);
|
|
SELF_CHECK (strcmp (minus_one.cur_tok (), "-1") == 0);
|
|
}
|
|
END_CATCH;
|
|
}
|
|
|
|
/* Test that a - followed by not a number does not give an error. */
|
|
{
|
|
number_or_range_parser nan ("-whatever");
|
|
|
|
SELF_CHECK (nan.finished ());
|
|
SELF_CHECK (strcmp (nan.cur_tok (), "-whatever") == 0);
|
|
}
|
|
}
|
|
|
|
static void
|
|
test_parse_flags ()
|
|
{
|
|
const char *flags = "abc";
|
|
const char *non_flags_args = "non flags args";
|
|
|
|
/* Extract twice the same flag, separated by one space. */
|
|
{
|
|
const char *t1 = "-a -a non flags args";
|
|
|
|
SELF_CHECK (parse_flags (&t1, flags) == 1);
|
|
SELF_CHECK (parse_flags (&t1, flags) == 1);
|
|
SELF_CHECK (strcmp (t1, non_flags_args) == 0);
|
|
}
|
|
|
|
/* Extract some flags, separated by one or more spaces. */
|
|
{
|
|
const char *t2 = "-c -b -c -b -c non flags args";
|
|
|
|
SELF_CHECK (parse_flags (&t2, flags) == 3);
|
|
SELF_CHECK (parse_flags (&t2, flags) == 2);
|
|
SELF_CHECK (parse_flags (&t2, flags) == 3);
|
|
SELF_CHECK (parse_flags (&t2, flags) == 2);
|
|
SELF_CHECK (parse_flags (&t2, flags) == 3);
|
|
SELF_CHECK (strcmp (t2, non_flags_args) == 0);
|
|
}
|
|
|
|
/* Check behaviour where there is no flag to extract. */
|
|
{
|
|
const char *t3 = non_flags_args;
|
|
|
|
SELF_CHECK (parse_flags (&t3, flags) == 0);
|
|
SELF_CHECK (strcmp (t3, non_flags_args) == 0);
|
|
}
|
|
|
|
/* Extract 2 known flags in front of unknown flags. */
|
|
{
|
|
const char *t4 = "-c -b -x -y -z -c";
|
|
|
|
SELF_CHECK (parse_flags (&t4, flags) == 3);
|
|
SELF_CHECK (parse_flags (&t4, flags) == 2);
|
|
SELF_CHECK (strcmp (t4, "-x -y -z -c") == 0);
|
|
SELF_CHECK (parse_flags (&t4, flags) == 0);
|
|
SELF_CHECK (strcmp (t4, "-x -y -z -c") == 0);
|
|
}
|
|
|
|
/* Check combined flags are not recognised. */
|
|
{
|
|
const char *t5 = "-c -cb -c";
|
|
|
|
SELF_CHECK (parse_flags (&t5, flags) == 3);
|
|
SELF_CHECK (parse_flags (&t5, flags) == 0);
|
|
SELF_CHECK (strcmp (t5, "-cb -c") == 0);
|
|
}
|
|
}
|
|
|
|
static void
|
|
test_parse_flags_qcs ()
|
|
{
|
|
const char *non_flags_args = "non flags args";
|
|
|
|
/* Test parsing of 2 flags out of the known 3. */
|
|
{
|
|
const char *t1 = "-q -s non flags args";
|
|
qcs_flags flags;
|
|
|
|
SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t1.q",
|
|
&t1,
|
|
&flags) == 1);
|
|
SELF_CHECK (flags.quiet && !flags.cont && !flags.silent);
|
|
SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t1.s",
|
|
&t1,
|
|
&flags) == 1);
|
|
SELF_CHECK (flags.quiet && !flags.cont && flags.silent);
|
|
SELF_CHECK (strcmp (t1, non_flags_args) == 0);
|
|
}
|
|
|
|
/* Test parsing when there is no flag. */
|
|
{
|
|
const char *t2 = "non flags args";
|
|
qcs_flags flags;
|
|
|
|
SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t2",
|
|
&t2,
|
|
&flags) == 0);
|
|
SELF_CHECK (!flags.quiet && !flags.cont && !flags.silent);
|
|
SELF_CHECK (strcmp (t2, non_flags_args) == 0);
|
|
}
|
|
|
|
/* Test parsing stops at a negative integer. */
|
|
{
|
|
const char *t3 = "-123 non flags args";
|
|
const char *orig_t3 = t3;
|
|
qcs_flags flags;
|
|
|
|
SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t3",
|
|
&t3,
|
|
&flags) == 0);
|
|
SELF_CHECK (!flags.quiet && !flags.cont && !flags.silent);
|
|
SELF_CHECK (strcmp (t3, orig_t3) == 0);
|
|
}
|
|
|
|
/* Test mutual exclusion between -c and -s. */
|
|
{
|
|
const char *t4 = "-c -s non flags args";
|
|
qcs_flags flags;
|
|
|
|
TRY
|
|
{
|
|
SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t4.cs",
|
|
&t4,
|
|
&flags) == 1);
|
|
|
|
(void) parse_flags_qcs ("test_parse_flags_qcs.t4.cs",
|
|
&t4,
|
|
&flags);
|
|
SELF_CHECK (false);
|
|
}
|
|
CATCH (ex, RETURN_MASK_ERROR)
|
|
{
|
|
SELF_CHECK (ex.reason == RETURN_ERROR);
|
|
SELF_CHECK (ex.error == GENERIC_ERROR);
|
|
SELF_CHECK
|
|
(strcmp (ex.message,
|
|
"test_parse_flags_qcs.t4.cs: "
|
|
"-c and -s are mutually exclusive") == 0);
|
|
}
|
|
END_CATCH;
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
test_cli_utils ()
|
|
{
|
|
selftests::cli_utils::test_number_or_range_parser ();
|
|
selftests::cli_utils::test_parse_flags ();
|
|
selftests::cli_utils::test_parse_flags_qcs ();
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
void
|
|
_initialize_cli_utils_selftests ()
|
|
{
|
|
selftests::register_test ("cli_utils",
|
|
selftests::cli_utils::test_cli_utils);
|
|
}
|