mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
230d2906b9
This renames the gdb exception types. The old types were only needed due to the macros in common-exception.h that are now gone. The intermediate layer of gdb_exception_RETURN_MASK_ALL did not seem needed, so this patch removes it entirely. gdb/ChangeLog 2019-04-08 Tom Tromey <tom@tromey.com> * common/common-exceptions.h (gdb_exception_RETURN_MASK_ALL): Remove. (gdb_exception_error): Rename from gdb_exception_RETURN_MASK_ERROR. (gdb_exception_quit): Rename from gdb_exception_RETURN_MASK_QUIT. (gdb_quit_bad_alloc): Update. * aarch64-tdep.c: Update. * ada-lang.c: Update. * ada-typeprint.c: Update. * ada-valprint.c: Update. * amd64-tdep.c: Update. * arch-utils.c: Update. * break-catch-throw.c: Update. * breakpoint.c: Update. * btrace.c: Update. * c-varobj.c: Update. * cli/cli-cmds.c: Update. * cli/cli-interp.c: Update. * cli/cli-script.c: Update. * common/common-exceptions.c: Update. * common/new-op.c: Update. * common/selftest.c: Update. * compile/compile-c-symbols.c: Update. * compile/compile-cplus-symbols.c: Update. * compile/compile-object-load.c: Update. * compile/compile-object-run.c: Update. * completer.c: Update. * corelow.c: Update. * cp-abi.c: Update. * cp-support.c: Update. * cp-valprint.c: Update. * darwin-nat.c: Update. * disasm-selftests.c: Update. * dtrace-probe.c: Update. * dwarf-index-cache.c: Update. * dwarf-index-write.c: Update. * dwarf2-frame-tailcall.c: Update. * dwarf2-frame.c: Update. * dwarf2loc.c: Update. * dwarf2read.c: Update. * eval.c: Update. * event-loop.c: Update. * event-top.c: Update. * exec.c: Update. * f-valprint.c: Update. * fbsd-tdep.c: Update. * frame-unwind.c: Update. * frame.c: Update. * gdbtypes.c: Update. * gnu-v3-abi.c: Update. * guile/guile-internal.h: Update. * guile/scm-block.c: Update. * guile/scm-breakpoint.c: Update. * guile/scm-cmd.c: Update. * guile/scm-disasm.c: Update. * guile/scm-frame.c: Update. * guile/scm-lazy-string.c: Update. * guile/scm-math.c: Update. * guile/scm-param.c: Update. * guile/scm-ports.c: Update. * guile/scm-pretty-print.c: Update. * guile/scm-symbol.c: Update. * guile/scm-symtab.c: Update. * guile/scm-type.c: Update. * guile/scm-value.c: Update. * i386-linux-tdep.c: Update. * i386-tdep.c: Update. * inf-loop.c: Update. * infcall.c: Update. * infcmd.c: Update. * infrun.c: Update. * jit.c: Update. * language.c: Update. * linespec.c: Update. * linux-fork.c: Update. * linux-nat.c: Update. * linux-tdep.c: Update. * linux-thread-db.c: Update. * main.c: Update. * mi/mi-cmd-break.c: Update. * mi/mi-cmd-stack.c: Update. * mi/mi-interp.c: Update. * mi/mi-main.c: Update. * objc-lang.c: Update. * p-valprint.c: Update. * parse.c: Update. * ppc-linux-tdep.c: Update. * printcmd.c: Update. * python/py-arch.c: Update. * python/py-breakpoint.c: Update. * python/py-cmd.c: Update. * python/py-finishbreakpoint.c: Update. * python/py-frame.c: Update. * python/py-framefilter.c: Update. * python/py-gdb-readline.c: Update. * python/py-inferior.c: Update. * python/py-infthread.c: Update. * python/py-lazy-string.c: Update. * python/py-linetable.c: Update. * python/py-objfile.c: Update. * python/py-param.c: Update. * python/py-prettyprint.c: Update. * python/py-progspace.c: Update. * python/py-record-btrace.c: Update. * python/py-record.c: Update. * python/py-symbol.c: Update. * python/py-type.c: Update. * python/py-unwind.c: Update. * python/py-utils.c: Update. * python/py-value.c: Update. * python/python.c: Update. * record-btrace.c: Update. * record-full.c: Update. * remote-fileio.c: Update. * remote.c: Update. * riscv-tdep.c: Update. * rs6000-aix-tdep.c: Update. * rs6000-tdep.c: Update. * rust-exp.y: Update. * rust-lang.c: Update. * s390-tdep.c: Update. * selftest-arch.c: Update. * solib-dsbt.c: Update. * solib-frv.c: Update. * solib-spu.c: Update. * solib-svr4.c: Update. * solib.c: Update. * sparc64-linux-tdep.c: Update. * stack.c: Update. * symfile-mem.c: Update. * symmisc.c: Update. * target.c: Update. * thread.c: Update. * top.c: Update. * tracefile-tfile.c: Update. * tui/tui.c: Update. * typeprint.c: Update. * unittests/cli-utils-selftests.c: Update. * unittests/parse-connection-spec-selftests.c: Update. * valops.c: Update. * valprint.c: Update. * value.c: Update. * varobj.c: Update. * windows-nat.c: Update. * x86-linux-nat.c: Update. * xml-support.c: Update. gdb/gdbserver/ChangeLog 2019-04-08 Tom Tromey <tom@tromey.com> * gdbreplay.c: Update. * linux-low.c: Update. * server.c: Update.
252 lines
6.5 KiB
C
252 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 (const gdb_exception_error &ex)
|
|
{
|
|
SELF_CHECK (ex.reason == RETURN_ERROR);
|
|
SELF_CHECK (ex.error == GENERIC_ERROR);
|
|
SELF_CHECK (strcmp (ex.what (), "negative value") == 0);
|
|
SELF_CHECK (strcmp (minus_one.cur_tok (), "-1") == 0);
|
|
}
|
|
}
|
|
|
|
/* 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 (const gdb_exception_error &ex)
|
|
{
|
|
SELF_CHECK (ex.reason == RETURN_ERROR);
|
|
SELF_CHECK (ex.error == GENERIC_ERROR);
|
|
SELF_CHECK
|
|
(strcmp (ex.what (),
|
|
"test_parse_flags_qcs.t4.cs: "
|
|
"-c and -s are mutually exclusive") == 0);
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
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);
|
|
}
|