[PATCH xts] xts5: Build tetexec.cfg from 'make all'

Adam Jackson ajax at redhat.com
Thu Jun 15 17:08:41 UTC 2017


XSetFontPath/[124], when run from xserver's piglit test scripts, will
emit errors like this:

    510|0|system 0, errno = 2 (ENOENT): could not open config file "/home/ajax/git/xts/xts5/tetexec.cfg"
    15|0 3.3-lite 1|TCM Start
    520|0 0 00014075 1 1|REPORT: Required parameter DISPLAY was not set
    400|0 2 1 12:58:57|IC Start
    200|0 2 12:58:57|TP Start
    520|0 2 00014075 1 1|VSW5TESTSUITE PURPOSE 2
    520|0 2 00014075 1 2|Assertion XSetFontPath-2.(A)
    520|0 2 00014075 1 3|On a call to XSetFontPath, the directory search path for
    520|0 2 00014075 1 4|font lookup is set for all clients.
    520|0 2 00014075 1 5|METH: Open a second client.
    520|0 2 00014075 1 6|METH: Set font path in first client.
    520|0 2 00014075 1 7|METH: Get font path in the second client.
    520|0 2 00014075 1 8|METH: Verify that the font is the same in each client.
    520|0 2 00014075 1 9|REPORT: XT_FONTPATH_GOOD not set in config file
    220|0 2 2 12:58:57|UNRESOLVED
    410|0 2 1 12:58:57|IC End

Though xts looks for the default config file, it does not _build_ it
unless running 'make check' from xts itself. We don't want or need to
enforce that, so just build it by default.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 xts5/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index bcebcbb9..920364fd 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = bin/xts-config.in bin/xts-run.in lib
 bin_SCRIPTS = bin/xts-config bin/xts-run
 dist_xts5_DATA = tetexec.cfg.in tet_scen tet_code
 xts5dir = $(datadir)/xts5
-check_DATA = tetexec.cfg
+noinst_DATA = tetexec.cfg
 
 xts5docdir = $(xts5dir)/doc
 dist_xts5doc_DATA = doc/release_notes doc/VSW_RELEASE doc/VSW_SPEC
-- 
2.13.0



More information about the xorg-devel mailing list