Re: [igt-dev] [PATCH i-g-t] lib/tests: Drop automake support

Antonio Argenziano
2019-02-07T16:42:11Z

On 07/02/19 08:36, Daniel Vetter wrote:
> On Thu, Feb 07, 2019 at 08:19:15AM -0800, Antonio Argenziano wrote:
>>
>>
>> On 07/02/19 07:25, Daniel Vetter wrote:
>>> Really not needed if we check this with meson.
>>
>> Maybe now drop the automake support from readme as well: "Currently we
>> support both meson and automake as build systems".
>
> automake is still supported for building tools and tests. Just not for the
> more auxiliary stuff like library self-tests, documentation and all that.
> I did merge a few patches to make it clear that you should use meson, but
> automake is still there somewhat. Not yet clear enough?

:) Missed the fact this is *lib*/tests not tests/

Antonio

> -Daniel
>
>>
>> Antonio
>>
>>>
>>> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>>> ---
>>> Passed gitlab-ci:
>>>
>>> https://gitlab.freedesktop.org/danvet/igt-gpu-tools/commit/28a1d87c2001c473ecd2b89edf7ad1ba26b5d039
>>> ---
>>> configure.ac | 1 -
>>> lib/Makefile.am | 2 --
>>> lib/tests/Makefile.am | 24 ------------------------
>>> lib/tests/Makefile.sources | 36 ------------------------------------
>>> 4 files changed, 63 deletions(-)
>>> delete mode 100644 lib/tests/Makefile.am
>>> delete mode 100644 lib/tests/Makefile.sources
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index b46f024f875a..0588b0f9dad3 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -294,7 +294,6 @@ AC_CONFIG_FILES([
>>> Makefile
>>> benchmarks/Makefile
>>> lib/Makefile
>>> - lib/tests/Makefile
>>> scripts/Makefile
>>> tests/Makefile
>>> tests/intel-ci/Makefile
>>> diff --git a/lib/Makefile.am b/lib/Makefile.am
>>> index 3b88e3397833..3e6a7fdba9ac 100644
>>> --- a/lib/Makefile.am
>>> +++ b/lib/Makefile.am
>>> @@ -1,8 +1,6 @@
>>> IGT_LIB_PATH := $(builddir)
>>> GPU_TOOLS_PATH := $(top_srcdir)
>>> -SUBDIRS = . tests
>>> -
>>> include Makefile.sources
>>> libintel_tools_la_SOURCES = $(lib_source_list)
>>> diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
>>> deleted file mode 100644
>>> index 789fc551f9be..000000000000
>>> --- a/lib/tests/Makefile.am
>>> +++ /dev/null
>>> @@ -1,24 +0,0 @@
>>> -include Makefile.sources
>>> -
>>> -check_PROGRAMS = $(check_prog_list)
>>> -check_SCRIPTS = $(check_script_list)
>>> -
>>> -AM_TESTS_ENVIRONMENT = \
>>> - top_builddir=$(top_builddir) \
>>> - top_srcdir=$(top_srcdir)
>>> -
>>> -AM_CPPFLAGS = \
>>> - -I$(top_srcdir)/include/drm-uapi \
>>> - -I$(srcdir)/../.. \
>>> - -I$(srcdir)/.. \
>>> - -I$(top_srcdir)/lib/stubs/syscalls \
>>> - -include "$(srcdir)/../../lib/check-ndebug.h" \
>>> - -DIGT_DATADIR=\""$(abs_srcdir)"\" \
>>> - -D_GNU_SOURCE
>>> -
>>> -AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)
>>> -
>>> -LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS) $(TIMER_LIBS)
>>> -
>>> -LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) -lm
>>> -AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
>>> diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
>>> deleted file mode 100644
>>> index 8d1a8dea8263..000000000000
>>> --- a/lib/tests/Makefile.sources
>>> +++ /dev/null
>>> @@ -1,36 +0,0 @@
>>> -check_prog_list = \
>>> - igt_no_exit \
>>> - igt_no_exit_list_only \
>>> - igt_fork_helper \
>>> - igt_list_only \
>>> - igt_no_subtest \
>>> - igt_simulation \
>>> - igt_simple_test_subtests \
>>> - igt_stats \
>>> - igt_timeout \
>>> - igt_invalid_subtest_name \
>>> - igt_segfault \
>>> - igt_subtest_group \
>>> - igt_assert \
>>> - igt_exit_handler \
>>> - igt_hdmi_inject \
>>> - igt_can_fail \
>>> - igt_can_fail_simple \
>>> - $(NULL)
>>> -
>>> -TESTS = \
>>> - $(check_prog_list) \
>>> - $(check_script_list) \
>>> - $(NULL)
>>> -
>>> -# Test that exercise specific asserts in the test framework library and are
>>> -# hence expected to fail.
>>> -DISABLE_HARD_ERRORS=1
>>> -XFAIL_TESTS = \
>>> - igt_no_exit \
>>> - igt_no_exit_list_only \
>>> - igt_no_subtest \
>>> - igt_simple_test_subtests \
>>> - igt_timeout \
>>> - igt_invalid_subtest_name \
>>> - $(NULL)
>>>