From fe42d8387480a4fe3dc4183680432a30db4c3aa3 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 22 Jan 2019 14:42:13 +0100 Subject: automake: Drop runner build support Main use case here is CI, which already builds using meson. Acked-by: Petri Latvala Signed-off-by: Daniel Vetter --- runner/Makefile.am | 53 --------------------------------------------- runner/testdata/Makefile.am | 25 --------------------- 2 files changed, 78 deletions(-) delete mode 100644 runner/Makefile.am delete mode 100644 runner/testdata/Makefile.am (limited to 'runner') diff --git a/runner/Makefile.am b/runner/Makefile.am deleted file mode 100644 index b55cf797..00000000 --- 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 fe225d8d..00000000 --- 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 -- cgit v1.2.3