From 5dafee1853b6eac164f69d4e65658dc34785ccf9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 Feb 2012 14:11:08 +0100 Subject: [PATCH] dri: Reuse dri_test.c for stub glapi symbols for unit testing. This file is used to provide stubs for the link test in gallium dri drivers. But the same stubs without the main can be used for making unit tests for code in a dri driver. Acked-by: Paul Berry --- src/mesa/drivers/dri/common/Makefile.am | 8 +++++++- src/mesa/drivers/dri/common/dri_test.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am index d81bc0e3f4d..6e9d738fa52 100644 --- a/src/mesa/drivers/dri/common/Makefile.am +++ b/src/mesa/drivers/dri/common/Makefile.am @@ -28,11 +28,17 @@ AM_CFLAGS = \ $(API_DEFINES) \ $(LIBDRM_CFLAGS) -noinst_LTLIBRARIES = libdricommon.la +noinst_LTLIBRARIES = \ + libdricommon.la \ + libdri_test_stubs.la libdricommon_la_SOURCES = \ utils.c \ dri_util.c \ xmlconfig.c +libdri_test_stubs_la_SOURCES = \ + dri_test.c +libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN + sysconf_DATA = drirc diff --git a/src/mesa/drivers/dri/common/dri_test.c b/src/mesa/drivers/dri/common/dri_test.c index 793f0c37d79..35732857dda 100644 --- a/src/mesa/drivers/dri/common/dri_test.c +++ b/src/mesa/drivers/dri/common/dri_test.c @@ -82,8 +82,10 @@ _glthread_GetID(void) return 0; } +#ifndef NO_MAIN int main(int argc, char** argv) { void* p = __driDriverExtensions; return (int)(unsigned long)p; } +#endif -- 2.30.2