[groff] 02/02: Mark expected-to-fail test as XFAIL.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit afdee89e1ca9f5919a75e8d8b35c353ee99a0622
Author: G. Branden Robinson <address@hidden>
Date:   Tue Sep 10 16:19:53 2019 +1000

    Mark expected-to-fail test as XFAIL.
    
    Automake supports XFAIL and XPASS, so actually use the infrastructure as
    intended.
    
    * Makefile.am: Declare XFAIL_TESTS variable.
    * src/roff/groff/groff.am: Declare string_case_xform_unicode_escape.sh
    as an XFAIL test.
    * src/roff/groff/tests/string_case_xform_unicode_escape.sh: Set the
    expected output to what it would be if string case transforms worked on
    groff Unicode escapes.
---
 ChangeLog                                                | 14 ++++++++++++++
 Makefile.am                                              |  1 +
 src/roff/groff/groff.am                                  |  4 ++++
 src/roff/groff/tests/string_case_xform_unicode_escape.sh | 11 ++++++-----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db7f37d..e4537dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2019-09-10  G. Branden Robinson <address@hidden>
 
+       Mark expected-to-fail test as XFAIL.
+
+       Automake supports XFAIL and XPASS, so actually use the
+       infrastructure as intended.
+
+       * Makefile.am: Declare XFAIL_TESTS variable.
+       * src/roff/groff/groff.am: Declare
+       string_case_xform_unicode_escape.sh as an XFAIL test.
+       * src/roff/groff/tests/string_case_xform_unicode_escape.sh: Set
+       the expected output to what it would be if string case
+       transforms worked on groff Unicode escapes.
+
+2019-09-10  G. Branden Robinson <address@hidden>
+
        Retire '@G@' build system macro.
 
        It existed only for forcibly-capitalized man page titles; it was
diff --git a/Makefile.am b/Makefile.am
index 4dfae2c..cd42b20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -565,6 +565,7 @@ SUFFIXES =
 check_SCRIPTS =
 check_PROGRAMS =
 TESTS =
+XFAIL_TESTS =
 AM_TESTS_ENVIRONMENT = \
   abs_top_srcdir=$(abs_top_srcdir) \
   abs_top_builddir=$(abs_top_builddir) \
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index b5a8adb..77487b7 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -48,6 +48,10 @@ groff_TESTS = \
   src/roff/groff/tests/string_case_xform_errors.sh
 TESTS += $(groff_TESTS)
 
+groff_XFAIL_TESTS = \
+  src/roff/groff/tests/string_case_xform_unicode_escape.sh
+XFAIL_TESTS += $(groff_XFAIL_TESTS)
+
 MOSTLYCLEANFILES += groff_opts.tmp $(GROFF_OPTS_OUTPUT)
 
 groff_opts.tmp: src/roff/groff/groff.cpp
diff --git a/src/roff/groff/tests/string_case_xform_unicode_escape.sh 
b/src/roff/groff/tests/string_case_xform_unicode_escape.sh
index 672aec3..8f9e390 100755
--- a/src/roff/groff/tests/string_case_xform_unicode_escape.sh
+++ b/src/roff/groff/tests/string_case_xform_unicode_escape.sh
@@ -22,11 +22,12 @@ groff="${abs_top_builddir:-.}/test-groff"
 
 # The following is what we expect in the future when we support Unicode
 # case transformations.
-#expected="attaché ATTACHÉ"
-#
-# For now, we expect problems.
-expected="<standard input>:4: backtrace: string 'attache'
-troff: <standard input>:5: warning: can't find special character 'U0065_0301'"
+expected="attaché ATTACHÉ"
+
+# For now, we expect problems like this:
+# <standard input>:4: backtrace: string 'attache'
+# troff: <standard input>:5: warning: can't find special character
+#   'U0065_0301'
 
 actual=$("$groff" -Tutf8 2>&1 > /dev/null <<EOF
 .pl 1v