OSDN Git Service

build: test: enable out-of-source building
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Mon, 22 Jan 2018 13:07:04 +0000 (14:07 +0100)
committerXiang, Haihao <haihao.xiang@intel.com>
Sun, 11 Feb 2018 11:35:46 +0000 (19:35 +0800)
It is a good practice to build packages out-of-source tree, but its
support for the unit test is not correct. This patch enables it.

test/Makefile.am

index f250fee..112eff0 100644 (file)
@@ -11,7 +11,7 @@ AM_CPPFLAGS =                                                         \
        -DGTEST_HAS_TR1_TUPLE=1                                         \
        -DPTHREADS                                                      \
        -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""                   \
-       -DTEST_VA_DRIVERS_PATH="\"$(abs_top_srcdir)/src/.libs\""        \
+       -DTEST_VA_DRIVERS_PATH="\"$(abs_top_builddir)/src/.libs\""      \
        -std=c++11                                                      \
        $(NULL)
 
@@ -85,7 +85,7 @@ test_i965_drv_video_LDFLAGS =                                         \
        $(NULL)
 
 test_i965_drv_video_LDADD =                                            \
-       $(top_srcdir)/src/libi965_drv_video.la                          \
+       $(top_builddir)/src/libi965_drv_video.la                        \
        libgtest.la                                                     \
        $(DRM_LIBS)                                                     \
        $(LIBVA_DEPS_LIBS)                                              \
@@ -94,6 +94,7 @@ test_i965_drv_video_LDADD =                                           \
        $(NULL)
 
 test_i965_drv_video_CPPFLAGS =                                         \
+       -I$(top_srcdir)/src                                             \
        $(DRM_CFLAGS)                                                   \
        $(LIBVA_DEPS_CFLAGS)                                            \
        $(LIBVA_DRM_DEPS_CFLAGS)                                        \