From aeafdfff053c4b4117e57c1b181f75bc241db6ba Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 3 Mar 2015 14:21:40 +0100 Subject: [PATCH] tests: Remove some duplications from Makefile-tests.am Signed-off-by: Giuseppe Scrivano --- Makefile-tests.am | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Makefile-tests.am b/Makefile-tests.am index 49cca8ce..1c3b50b8 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -104,21 +104,23 @@ endif endif # "make check" do not depend from --enable-installed-tests -check_PROGRAMS = tests/test-rollsum tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff - -tests_test_ot_unix_utils_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -tests_test_ot_unix_utils_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) - -tests_test_rollsum_SOURCES = src/libostree/bupsplit.c src/libostree/ostree-rollsum.c tests/test-rollsum.c -tests_test_rollsum_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -tests_test_rollsum_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) - -tests_test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c -tests_test_varint_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -tests_test_varint_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) - -tests_test_bsdiff_SOURCES = tests/test-bsdiff.c bsdiff/bsdiff.c bsdiff/bspatch.c -tests_test_bsdiff_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -tests_test_bsdiff_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) +noinst_PROGRAMS += tests/test-rollsum TESTS = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff +check_PROGRAMS = $(TESTS) +TESTS_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) +TESTS_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) + +tests_test_rollsum_SOURCES = src/libostree/ostree-rollsum.c tests/test-rollsum.c +tests_test_rollsum_CFLAGS = $(TESTS_CFLAGS) +tests_test_rollsum_LDADD = libbupsplit.la $(TESTS_LDADD) + +tests_test_ot_unix_utils_CFLAGS = $(TESTS_CFLAGS) +tests_test_ot_unix_utils_LDADD = $(TESTS_LDADD) + +tests_test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c +tests_test_varint_CFLAGS = $(TESTS_CFLAGS) +tests_test_varint_LDADD = $(TESTS_LDADD) + +tests_test_bsdiff_CFLAGS = $(TESTS_CFLAGS) +tests_test_bsdiff_LDADD = libbsdiff.la $(TESTS_LDADD)