[igt-dev] [PATCH i-g-t 5/7] automake: Drop runner build support

Daniel Vetter
2019-01-22T13:42:29Z

Main use case here is CI, which already builds using meson.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
Makefile.am | 4 ---
configure.ac | 14 ----------
runner/Makefile.am | 53 -------------------------------------
runner/testdata/Makefile.am | 25 -----------------
4 files changed, 96 deletions(-)
delete mode 100644 runner/Makefile.am
delete mode 100644 runner/testdata/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8bcdb65c6fc7..1cc98264bc69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,10 +27,6 @@ if BUILD_TESTS
SUBDIRS += tests
endif

-if BUILD_RUNNER
-SUBDIRS += runner
-endif
-
if BUILD_X86
SUBDIRS += overlay benchmarks
endif
diff --git a/configure.ac b/configure.ac
index 05952edba8fe..7e915300b3d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,18 +292,6 @@ fi
AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes])
AC_DEFINE_UNQUOTED(TARGET_CPU_PLATFORM, ["$host_cpu"], [Target platform])

-AC_ARG_ENABLE(runner,
- AS_HELP_STRING([--disable-runner],
- [Enable building test runner (default: auto)]),
- [BUILD_RUNNER=$enableval], [BUILD_RUNNER="auto"])
-if test "x$BUILD_RUNNER" = xauto; then
- PKG_CHECK_EXISTS([json-c], [BUILD_RUNNER=yes], [BUILD_RUNNER=no])
-fi
-if test "x$BUILD_RUNNER" = xyes; then
- PKG_CHECK_MODULES(JSONC, [json-c])
-fi
-AM_CONDITIONAL(BUILD_RUNNER, [test "x$BUILD_RUNNER" = xyes])
-
files="broadwell cherryview haswell ivybridge sandybridge valleyview skylake"
for file in $files; do
REGISTER_FILES="$REGISTER_FILES $file `cat $srcdir/tools/registers/$file`"
@@ -327,8 +315,6 @@ AC_CONFIG_FILES([
include/Makefile
include/drm-uapi/Makefile
overlay/Makefile
- runner/Makefile
- runner/testdata/Makefile
])

AC_CONFIG_FILES([tools/intel_aubdump], [chmod +x tools/intel_aubdump])
diff --git a/runner/Makefile.am b/runner/Makefile.am
deleted file mode 100644
index b55cf797f8db..000000000000
--- a/runner/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-
-if BUILD_RUNNER
-
-SUBDIRS = testdata
-
-runnerlib = librunner.la
-noinst_LTLIBRARIES = $(runnerlib)
-librunner_la_SOURCES = \
- settings.c \
- job_list.c \
- executor.c \
- resultgen.c \
- $(NULL)
-
-bin_PROGRAMS = \
- igt_runner \
- igt_resume \
- igt_results \
- $(NULL)
-
-LDADD = $(runnerlib) $(JSONC_LIBS) ../lib/libintel_tools.la
-
-igt_runner_SOURCES = runner.c
-igt_resume_SOURCES = resume.c
-igt_results_SOURCES = results.c
-
-AM_CFLAGS = $(JSONC_CFLAGS) \
- $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS) \
- -I$(srcdir)/.. \
- -I$(srcdir)/../lib \
- -D_GNU_SOURCE
-
-TESTS = runner_test runner_json_test
-check_PROGRAMS = runner_test runner_json_test
-
-runner_test_SOURCES = runner_tests.c
-runner_test_CFLAGS = -DTESTDATA_DIRECTORY=\"$(abs_builddir)/testdata\" \
- -I$(top_srcdir)/include/drm-uapi \
- $(DRM_CFLAGS) $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) \
- -I$(srcdir)/.. \
- -I$(srcdir)/../lib \
- -D_GNU_SOURCE
-
-runner_json_test_SOURCES = runner_json_tests.c
-runner_json_test_CFLAGS = -DJSON_TESTS_DIRECTORY=\"$(abs_builddir)/json_tests_data\" \
- $(JSONC_CFLAGS) \
- -I$(top_srcdir)/include/drm-uapi \
- $(DRM_CFLAGS) $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) \
- -I$(srcdir)/.. \
- -I$(srcdir)/../lib \
- -D_GNU_SOURCE
-
-endif
diff --git a/runner/testdata/Makefile.am b/runner/testdata/Makefile.am
deleted file mode 100644
index fe225d8dd431..000000000000
--- a/runner/testdata/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-testdata_progs = no-subtests skippers successtest
-
-noinst_PROGRAMS = $(testdata_progs)
-
-test-list.txt: Makefile
- @echo TESTLIST > $@
- @echo ${testdata_progs} >> $@
- @echo END TESTLIST >> $@
-
-noinst_DATA = test-list.txt
-
-all-local: .gitignore
-.gitignore: Makefile.am
- @echo "$(testdata_progs) test-list.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@
-
-CLEANFILES = test-list.txt .gitignore
-
-AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS) \
- -I$(top_srcdir)/include/drm-uapi \
- -I$(srcdir)/../.. \
- -I$(srcdir)/../../lib \
- $(DRM_CFLAGS) $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) \
- -D_GNU_SOURCE
-
-LDADD = $(top_builddir)/lib/libintel_tools.la
--
2.20.1