diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-10 04:16:38 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-10 04:16:38 +0000 |
| commit | 3e2a8630323db7343b66df0722b3b114fedee0db (patch) | |
| tree | fc2c63a8eb4d5980b1cbe11f1b4994f41a4d3359 /tests | |
| parent | b74477786377d6e86df12ff6c97529f481bbb4f1 (diff) | |
| parent | 6772ae34e92f88145264949a7db48f5c9b60fdb1 (diff) | |
| download | pango-3e2a8630323db7343b66df0722b3b114fedee0db.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
test-break: Make help output work again
See merge request GNOME/pango!332
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/layouts/valid-4.expected | 4 | ||||
| -rw-r--r-- | tests/test-break.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/layouts/valid-4.expected b/tests/layouts/valid-4.expected index 2534b6fc..66796cb5 100644 --- a/tests/layouts/valid-4.expected +++ b/tests/layouts/valid-4.expected @@ -23,11 +23,11 @@ i=6, index=152, paragraph-start=1, dir=ltr '' --- runs -i=1, index=0, chars=30, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'This paragraph should actual' +i=1, index=0, chars=30, level=0, gravity=south, flags=4, font=OMITTED, script=latin, language=en-us, 'This paragraph should actual' i=2, index=32, no run, line end i=3, index=32, chars=31, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'ly have multiple lines, unlike ' i=4, index=63, no run, line end -i=5, index=63, chars=29, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'all the other wannabe äöü pa' +i=5, index=63, chars=29, level=0, gravity=south, flags=4, font=OMITTED, script=latin, language=en-us, 'all the other wannabe äöü pa' i=6, index=96, no run, line end i=7, index=96, chars=27, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'ragraph tests in this ugh ' i=8, index=124, no run, line end diff --git a/tests/test-break.c b/tests/test-break.c index 413fd088..51074d80 100644 --- a/tests/test-break.c +++ b/tests/test-break.c @@ -322,7 +322,7 @@ main (int argc, char *argv[]) /* allow to easily generate expected output for new test cases */ if (argc > 1) { - if (strcmp (argv[1], "--help") == 0) + if (strcmp (argv[1], "--legend") == 0) { g_print ("test-break uses the following symbols for log attrs\n\n"); g_print ("Breaks: Words:\n" @@ -331,8 +331,9 @@ main (int argc, char *argv[]) " c - char break e - word end\n" "\n" "Whitespace: Sentences:\n" - " x - expandable space s - sentence start\n" - " w - whitespace e - sentence end\n"); + " x - expandable space b - sentence boundary\n" + " w - whitespace s - sentence start\n" + " e - sentence end\n"); } else { |