aboutsummaryrefslogtreecommitdiff
path: root/gdb/unittests
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2019-06-13 00:06:54 +0100
committerPedro Alves <palves@redhat.com>2019-06-13 00:24:17 +0100
commit6206060d9be8da3e701fe0307c6c01390e2b4ae2 (patch)
tree3e8f08e72db035a5278c44f53f737d59d8a547f1 /gdb/unittests
parent6665660a411ead049daa85cac5c629d637e22044 (diff)
downloadgdb-6206060d9be8da3e701fe0307c6c01390e2b4ae2.zip
gdb-6206060d9be8da3e701fe0307c6c01390e2b4ae2.tar.gz
gdb-6206060d9be8da3e701fe0307c6c01390e2b4ae2.tar.bz2
Delete parse_flags/parse_flags_qcs
Now that "thread/frame apply" have been converted to the gdb::option framework, these functions are no longer used. For a while, I thought about keeping the unit tests, by making a local version of parse_flags_qcs in the unit tests file. But all that would really test that is used by GDB itself, is the validate_flags_qcs function. So in the end, I went through all the unit tests, and converted any that wasn't already covered to gdb.base/options.exp tests. And those have all already been added in previous patches. gdb/ChangeLog: 2019-06-13 Pedro Alves <palves@redhat.com> * cli/cli-utils.c (parse_flags, parse_flags_qcs): Delete. * cli/cli-utils.h (parse_flags, parse_flags_qcs): Delete. * unittests/cli-utils-selftests.c (test_parse_flags) (test_parse_flags_qcs): Delete. (test_cli_utils): Don't call deleted functions.
Diffstat (limited to 'gdb/unittests')
-rw-r--r--gdb/unittests/cli-utils-selftests.c133
1 files changed, 0 insertions, 133 deletions
diff --git a/gdb/unittests/cli-utils-selftests.c b/gdb/unittests/cli-utils-selftests.c
index 99b98bf..a251a8e 100644
--- a/gdb/unittests/cli-utils-selftests.c
+++ b/gdb/unittests/cli-utils-selftests.c
@@ -102,142 +102,9 @@ test_number_or_range_parser ()
}
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 ();
}
}