From dab20975872a9b3d5f37beffa9e8e2b78efe6c02 Mon Sep 17 00:00:00 2001 From: Daniel Macks Date: Wed, 1 Jul 2015 14:36:35 -0400 Subject: [PATCH] Use GRegexMatchFlags not GRegexCompileFlags for TEST_MATCH _match_opts Fix the enums used in some test cases to use the correct enum type in some test cases. https://bugzilla.gnome.org/show_bug.cgi?id=751798 --- glib/tests/regex.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/glib/tests/regex.c b/glib/tests/regex.c index 5e5b88d..09083a3 100644 --- a/glib/tests/regex.c +++ b/glib/tests/regex.c @@ -2379,16 +2379,16 @@ main (int argc, char *argv[]) TEST_MATCH("a", 0, 0, "ba", 1, 0, 0, FALSE); TEST_MATCH("a", 0, 0, "bab", -1, 0, 0, TRUE); TEST_MATCH("a", 0, 0, "b", -1, 0, 0, FALSE); - TEST_MATCH("a", 0, G_REGEX_ANCHORED, "a", -1, 0, 0, TRUE); - TEST_MATCH("a", 0, G_REGEX_ANCHORED, "ab", -1, 1, 0, FALSE); - TEST_MATCH("a", 0, G_REGEX_ANCHORED, "ba", 1, 0, 0, FALSE); - TEST_MATCH("a", 0, G_REGEX_ANCHORED, "bab", -1, 0, 0, FALSE); - TEST_MATCH("a", 0, G_REGEX_ANCHORED, "b", -1, 0, 0, FALSE); - TEST_MATCH("a", 0, 0, "a", -1, 0, G_REGEX_ANCHORED, TRUE); - TEST_MATCH("a", 0, 0, "ab", -1, 1, G_REGEX_ANCHORED, FALSE); - TEST_MATCH("a", 0, 0, "ba", 1, 0, G_REGEX_ANCHORED, FALSE); - TEST_MATCH("a", 0, 0, "bab", -1, 0, G_REGEX_ANCHORED, FALSE); - TEST_MATCH("a", 0, 0, "b", -1, 0, G_REGEX_ANCHORED, FALSE); + TEST_MATCH("a", 0, G_REGEX_MATCH_ANCHORED, "a", -1, 0, 0, TRUE); + TEST_MATCH("a", 0, G_REGEX_MATCH_ANCHORED, "ab", -1, 1, 0, FALSE); + TEST_MATCH("a", 0, G_REGEX_MATCH_ANCHORED, "ba", 1, 0, 0, FALSE); + TEST_MATCH("a", 0, G_REGEX_MATCH_ANCHORED, "bab", -1, 0, 0, FALSE); + TEST_MATCH("a", 0, G_REGEX_MATCH_ANCHORED, "b", -1, 0, 0, FALSE); + TEST_MATCH("a", 0, 0, "a", -1, 0, G_REGEX_MATCH_ANCHORED, TRUE); + TEST_MATCH("a", 0, 0, "ab", -1, 1, G_REGEX_MATCH_ANCHORED, FALSE); + TEST_MATCH("a", 0, 0, "ba", 1, 0, G_REGEX_MATCH_ANCHORED, FALSE); + TEST_MATCH("a", 0, 0, "bab", -1, 0, G_REGEX_MATCH_ANCHORED, FALSE); + TEST_MATCH("a", 0, 0, "b", -1, 0, G_REGEX_MATCH_ANCHORED, FALSE); TEST_MATCH("a|b", 0, 0, "a", -1, 0, 0, TRUE); TEST_MATCH("\\d", 0, 0, EURO, -1, 0, 0, FALSE); TEST_MATCH("^.$", 0, 0, EURO, -1, 0, 0, TRUE); -- 2.7.4