From 91bf16be7da6241ca5f8e74075673d2ab7d2f154 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pq@iki.fi>
Date: Mon, 7 Jan 2019 15:04:21 +0200
Subject: [PATCH] tests: remove remnants of buffer-count test

The buffer-count test was added in
40c0c3f91eeb747b86df64579e3b3706cc5450af and removed in
4938f93f578c0d73d63068e4a777250fce7db430, but the removal left around
the dependency to EGL headers in weston-test.c.

Removal of those unneeded includes allows us to drop the EGL dependency
completely from weston-test.c build.

For the Meson build this means that there are no dependency('egl')
directives anymore without the user friendly error message.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
---
 Makefile.am         | 5 -----
 configure.ac        | 1 -
 tests/meson.build   | 5 +----
 tests/weston-test.c | 6 ------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 24e754e36..bf36c306d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1376,11 +1376,6 @@ weston_test_desktop_shell_la_SOURCES = 			\
 	tests/weston-test-desktop-shell.c		\
 	shared/helpers.h
 
-if ENABLE_EGL
-weston_test_la_CFLAGS += $(EGL_TESTS_CFLAGS)
-weston_test_la_LDFLAGS += $(EGL_TESTS_LIBS)
-endif
-
 libtest_runner_la_SOURCES =			\
 	tests/weston-test-runner.c		\
 	tests/weston-test-runner.h
diff --git a/configure.ac b/configure.ac
index 8ebe73ee2..225d6692d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,6 @@ AM_CONDITIONAL(ENABLE_EGL, test x$enable_egl = xyes)
 if test x$enable_egl = xyes; then
 	AC_DEFINE([ENABLE_EGL], [1], [Build Weston with EGL support])
 	PKG_CHECK_MODULES(EGL, [egl glesv2])
-        PKG_CHECK_MODULES([EGL_TESTS], [egl glesv2 wayland-client wayland-egl])
 	AC_CHECK_HEADERS([linux/sync_file.h])
 fi
 
diff --git a/tests/meson.build b/tests/meson.build
index f1bfe74a3..048a5398e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,10 +45,7 @@ exe_plugin_test = shared_library(
 	weston_test_server_protocol_h,
 	weston_test_protocol_c,
 	include_directories: include_directories('..', '../shared'),
-	dependencies: [
-		dep_libweston,
-		dependency('egl'),
-	],
+	dependencies: [ dep_libweston ],
 	name_prefix: '',
 	install: false,
 )
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 412eb243c..e38aff4c5 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -36,12 +36,6 @@
 #include "compositor/weston.h"
 #include "weston-test-server-protocol.h"
 
-#ifdef ENABLE_EGL
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include "weston-egl-ext.h"
-#endif /* ENABLE_EGL */
-
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"