diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-03-17 01:08:27 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-03-17 01:08:27 +0000 |
| commit | 33c02810c5fdc06deddbf0b1bfd78969da9ec739 (patch) | |
| tree | 5689fa28436f465a196f8cd4a90ee2264d35f4a3 /conform/Makefile | |
| parent | 0fbca26c39e4735e7285092c98c75500550d84f4 (diff) | |
| download | glibc-33c02810c5fdc06deddbf0b1bfd78969da9ec739.tar.gz glibc-33c02810c5fdc06deddbf0b1bfd78969da9ec739.tar.xz glibc-33c02810c5fdc06deddbf0b1bfd78969da9ec739.zip | |
conformtest: Support system-specific XFAILs.
conformtest has an internal XFAIL mechanism to allow failures of individual expectations to be ignored, so that known hard-to-fix failures (e.g. those affecting ABIs or requiring kernel changes) do not cause the overall tests to FAIL and so hide other failures from the same (header, standard) pair. Various such bugs are system-specific, so this patch adds a mechanism to allow system-specific XFAILs. A system-independent XFAIL is achieved by putting "xfail-" at the start of the relevant expectation in the *-data files. A system-specific XFAIL instead uses "xfail[cond]-", where "cond" is a condition listed in conformtest-xfail-conds in a sysdeps makefile (so one for x32 might set conformtest-xfail-conds = x86_64-x32-linux, for example, and then an expectation for tv_nsec's type could use xfail[x86_64-x32-linux]-). The actual names are arbitrary, just needing to match between the makefiles and the expectations, and if necessary you can use "xfail[cond1|cond2]-" for a test that is expected to fail under multiple conditions. As with system-independent XFAILs, I think system-specific ones should have a bug filed in Bugzilla and a comment referencing that bug. Tested for x86_64, including with test expectations and makefiles changed to use the new facility. * conform/conformtest.pl ($xfail_str): New variable. (--xfail=): New command-line option. (top level): Handle expectations starting xfail[cond]-. * conform/Makefile (conformtest-xfail): New variable. ($(conformtest-header-tests)): Pass $(conformtest-xfail) to conformtest.pl.
Diffstat (limited to 'conform/Makefile')
| -rw-r--r-- | conform/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/conform/Makefile b/conform/Makefile index b393641e5d..c07cc1d8d9 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -192,13 +192,18 @@ test-xfail-XOPEN2K8/signal.h/conform = yes test-xfail-XOPEN2K8/sys/wait.h/conform = yes conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I.. +# conformtest-xfail-conds may be set by a sysdeps Makefile fragment to +# a list of conditions that are considered to be true when encountered +# in xfail[cond]- lines in test expectations. +conformtest-xfail = $(if $(conformtest-xfail-conds),\ + --xfail='$(conformtest-xfail-conds)') $(conformtest-header-tests): $(objpfx)%/conform.out: \ conformtest.pl $(conformtest-headers-data) (set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \ mkdir -p $(@D)/scratch; \ $(PERL) -I. conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \ --flags='$(conformtest-cc-flags)' --standard=$$std \ - --headers=$$hdr > $@); \ + --headers=$$hdr $(conformtest-xfail) > $@); \ $(evaluate-test) $(linknamespace-symlists-tests): $(objpfx)symlist-%: list-header-symbols.pl |