[PATCH v4 xserver 0/6] Use single test binary

[Mihail Konev]

v3: Rename 'AM_CPPFLAGS +=' -> test_CPPFLAGS (fixes build of 2/6, breaks 5/6).

v4: Rename COMMON_LDFLAGS -> COMMON_LD_FLAGS (fixes automake warning).
    Add 'test_CPPFLAGS += AM_CPPFLAGS' (fixes 5/6 build).

Mihail Konev (6):
  tests: Refactor wraps into protocol-common.c
  tests: Convert test/xi1/ to single binary
  tests: Convert test/xi2/ to single binary
  tests: Convert test/ to single binary
  tests: Move test/{xi1,xi2}/tests to test/
  tests: Remove obsolete libxservertest.la

 configure.ac                             |   2 -
 test/.gitignore                          |  12 +--
 test/Makefile.am                         | 163 +++++++++++++++++++++----------
 test/fixes.c                             |   4 +-
 test/hashtabletest.c                     |   4 +-
 test/input.c                             |   4 +-
 test/list.c                              |   4 +-
 test/misc.c                              |   4 +-
 test/signal-logging.c                    |   4 +-
 test/string.c                            |   3 +-
 test/tests-common.c                      |  33 +++++++
 test/tests-common.h                      |  11 +++
 test/tests.c                             |  41 ++++++++
 test/tests.h                             |  38 +++++++
 test/touch.c                             |   6 +-
 test/xfree86.c                           |   4 +-
 test/xi1/.gitignore                      |   1 -
 test/xi1/Makefile.am                     |  34 -------
 test/xi1/protocol-xchangedevicecontrol.c |   3 +-
 test/xi2/.gitignore                      |  11 ---
 test/xi2/Makefile.am                     |  70 -------------
 test/xi2/protocol-common.c               |  41 ++++++++
 test/xi2/protocol-common.h               |   2 +
 test/xi2/protocol-eventconvert.c         |   4 +-
 test/xi2/protocol-xigetclientpointer.c   |  19 +---
 test/xi2/protocol-xigetselectedevents.c  |  24 +----
 test/xi2/protocol-xipassivegrabdevice.c  |  25 ++---
 test/xi2/protocol-xiquerydevice.c        |   4 +-
 test/xi2/protocol-xiquerypointer.c       |  23 +----
 test/xi2/protocol-xiqueryversion.c       |   4 +-
 test/xi2/protocol-xiselectevents.c       |  31 ++----
 test/xi2/protocol-xisetclientpointer.c   |  19 +---
 test/xi2/protocol-xiwarppointer.c        |  22 +----
 test/xi2/xi2.c                           |   6 +-
 test/xkb.c                               |   4 +-
 test/xtest.c                             |   4 +-
 36 files changed, 359 insertions(+), 329 deletions(-)
 create mode 100644 test/tests-common.c
 create mode 100644 test/tests-common.h
 create mode 100644 test/tests.c
 create mode 100644 test/tests.h
 delete mode 100644 test/xi1/.gitignore
 delete mode 100644 test/xi1/Makefile.am
 delete mode 100644 test/xi2/.gitignore
 delete mode 100644 test/xi2/Makefile.am

-- 
2.9.2