From f6fda5e5cd2f032c81a7c70dd350a4d1438b00be Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 27 Sep 2012 15:40:11 +0200 Subject: [PATCH] tests: sanitize build of test cases. Fix compiler paths when searching for dependencies, especially when they are in non-standard locations. Drop _DEPENDENCIES that are automatically generated. Also include a few cosmetics (vertical alignment). Signed-off-by: Gwenole Beauchesne --- test/Makefile.am | 3 --- test/basic/Makefile.am | 29 +++++++++++++++++++++++------ test/decode/Makefile.am | 14 ++------------ test/encode/Makefile.am | 28 +++++++++------------------- test/putsurface/Makefile.am | 4 ++-- test/v4l_h264/decode/Makefile.am | 13 +++++-------- test/v4l_h264/encode/Makefile.am | 13 +++++-------- test/vainfo/Makefile.am | 19 +++++++------------ 8 files changed, 53 insertions(+), 70 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index a524aec..451b90f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -20,9 +20,6 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 - SUBDIRS = common decode encode vainfo if USE_X11 diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index 2480022..b52f02e 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -20,12 +20,29 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -noinst_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ - test_07 test_08 test_09 test_10 test_11 - -AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - -TEST_LIBS = $(top_builddir)/va/libva-x11.la $(top_builddir)/va/libva.la -lpthread -lX11 +noinst_PROGRAMS = \ + test_01 \ + test_02 \ + test_03 \ + test_04 \ + test_05 \ + test_06 \ + test_07 \ + test_08 \ + test_09 \ + test_10 \ + test_11 \ + $(NULL) + +AM_CFLAGS = \ + -DIN_LIBVA \ + -I$(top_srcdir) \ + $(NULL) + +TEST_LIBS = \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/va/libva-x11.la \ + $(NULL) test_01_LDADD = $(TEST_LIBS) test_01_SOURCES = test_01.c diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am index 5513b87..6fffd31 100644 --- a/test/decode/Makefile.am +++ b/test/decode/Makefile.am @@ -22,31 +22,21 @@ bin_PROGRAMS = mpeg2vldemo loadjpeg -libva_helpers = \ - $(top_builddir)/test/common/libva-display.la \ - $(NULL) - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/test/common \ $(NULL) TEST_LIBS = \ - $(top_builddir)/va/libva-x11.la \ - $(top_builddir)/va/libva.la \ - $(libva_helpers) \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/test/common/libva-display.la \ $(NULL) -INCLUDES += $(X11_CFLAGS) -TEST_LIBS += $(X11_LIBS) - mpeg2vldemo_LDADD = $(TEST_LIBS) mpeg2vldemo_SOURCES = mpeg2vldemo.cpp -mpeg2vldemo_DEPENDENCIES = $(libva_helpers) loadjpeg_LDADD = $(TEST_LIBS) loadjpeg_SOURCES = loadjpeg.c tinyjpeg.c -loadjpeg_DEPENDENCIES = $(libva_helpers) valgrind: $(bin_PROGRAMS) for a in $(bin_PROGRAMS); do \ diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index d401756..933ac72 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -25,27 +25,17 @@ if USE_X11 bin_PROGRAMS += h264encode endif -libva_helpers = \ - $(top_builddir)/test/common/libva-display.la \ - $(NULL) +h264encode_SOURCES = h264encode_x11.c +h264encode_CFLAGS = -I$(top_srcdir) +h264encode_LDADD = \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/va/libva-x11.la -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/test/common \ - $(NULL) - -TEST_LIBS = \ - $(top_builddir)/va/libva-x11.la \ - $(top_builddir)/va/libva.la \ - $(libva_helpers) \ - $(NULL) - -h264encode_LDADD = $(TEST_LIBS) -h264encode_SOURCES = h264encode_x11.c - -avcenc_LDADD = $(TEST_LIBS) avcenc_SOURCES = avcenc.c -avcenc_DEPENDENCIES = $(libva_helpers) +avcenc_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/test/common +avcenc_LDADD = \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/test/common/libva-display.la EXTRA_DIST = h264encode_common.c diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am index 82927bf..15b3348 100644 --- a/test/putsurface/Makefile.am +++ b/test/putsurface/Makefile.am @@ -32,8 +32,8 @@ TEST_CFLAGS = \ $(NULL) TEST_LIBS = \ - $(top_builddir)/va/libva.la \ - -lpthread \ + $(top_builddir)/va/libva.la \ + -lpthread \ $(NULL) putsurface_SOURCES = putsurface_x11.c diff --git a/test/v4l_h264/decode/Makefile.am b/test/v4l_h264/decode/Makefile.am index e5c3185..ecc832a 100644 --- a/test/v4l_h264/decode/Makefile.am +++ b/test/v4l_h264/decode/Makefile.am @@ -22,14 +22,11 @@ noinst_PROGRAMS = decode -INCLUDES = -I$(top_srcdir) - -TEST_LIBS = $(top_builddir)/va/libva.la $(top_builddir)/va/libva-x11.la -lX11 -ldl - -decode_LDADD = $(TEST_LIBS) -decode_SOURCES = decode_x11.cpp TCPSocketServer.cpp - -decode_DEPENDENCIES = $(top_builddir)/va/libva.la $(top_builddir)/va/libva-x11.la +decode_SOURCES = decode_x11.cpp TCPSocketServer.cpp +decode_CFLAGS = -I$(top_srcdir) +decode_LDADD = \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/va/libva-x11.la valgrind: $(bin_PROGRAMS) for a in $(bin_PROGRAMS); do \ diff --git a/test/v4l_h264/encode/Makefile.am b/test/v4l_h264/encode/Makefile.am index 4c4d00e..00e4ad3 100644 --- a/test/v4l_h264/encode/Makefile.am +++ b/test/v4l_h264/encode/Makefile.am @@ -22,14 +22,11 @@ noinst_PROGRAMS = encode -INCLUDES = -I$(top_srcdir) - -TEST_LIBS = $(top_builddir)/va/libva.la $(top_builddir)/va/libva-x11.la -lX11 -ldl - -encode_LDADD = $(TEST_LIBS) -encode_SOURCES = capture.cpp avcenc.cpp TCPSocketClient.cpp - -capture_DEPENDENCIES = $(top_builddir)/va/libva.la $(top_builddir)/va/libva-x11.la +encode_SOURCES = capture.cpp avcenc.cpp TCPSocketClient.cpp +encode_CFLAGS = -I$(top_srcdir) +encode_LDADD = \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/va/libva-x11.la valgrind: $(bin_PROGRAMS) for a in $(bin_PROGRAMS); do \ diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am index 6e1ee4c..cc17a08 100644 --- a/test/vainfo/Makefile.am +++ b/test/vainfo/Makefile.am @@ -22,10 +22,6 @@ bin_PROGRAMS = vainfo -libva_helpers = \ - $(top_builddir)/test/common/libva-display.la \ - $(NULL) - vainfo_cflags = \ -I$(top_srcdir) \ -I$(top_srcdir)/test/common \ @@ -34,16 +30,15 @@ vainfo_cflags = \ $(NULL) vainfo_libs = \ - $(top_builddir)/va/libva.la \ - $(top_builddir)/va/libva-x11.la \ - $(libva_helpers) \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/va/libva-x11.la \ + $(top_builddir)/test/common/libva-display.la \ $(NULL) -vainfo_SOURCES = vainfo.c -noinst_HEADERS = $(source_h) -vainfo_CFLAGS = $(vainfo_cflags) -vainfo_LDADD = $(vainfo_libs) -vainfo_DEPENDENCIES = $(libva_helpers) +vainfo_SOURCES = vainfo.c +noinst_HEADERS = $(source_h) +vainfo_CFLAGS = $(vainfo_cflags) +vainfo_LDADD = $(vainfo_libs) valgrind: vainfo valgrind --leak-check=full --show-reachable=yes .libs/vainfo; -- 2.7.4