From 550b7a4e67a46d1de6b3e83b010b6d38b1c5e7d4 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 13 Jun 2019 14:10:51 -0400 Subject: [PATCH] tests: Move libtestcommon to utils Signed-off-by: Michael Jeanson Change-Id: I4efe6edae5d70921cbfb106f5184c58f7e2e5abb Reviewed-on: https://review.lttng.org/c/babeltrace/+/1426 Tested-by: jenkins Reviewed-by: Philippe Proulx --- tests/lib/Makefile.am | 11 ++++------- tests/utils/Makefile.am | 4 ++++ tests/{lib => utils}/common.c | 0 tests/{lib => utils}/common.h | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename tests/{lib => utils}/common.c (100%) rename tests/{lib => utils}/common.h (100%) diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 679fda2b..16616ccf 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -2,14 +2,11 @@ SUBDIRS = AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la +COMMON_TEST_LDADD = \ + $(top_builddir)/tests/utils/tap/libtap.la \ + $(top_builddir)/tests/utils/libtestcommon.la -libtestcommon_la_SOURCES = common.c common.h -noinst_LTLIBRARIES = libtestcommon.la - -COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la - -test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la +test_bitfield_LDADD = $(COMMON_TEST_LDADD) test_ctf_writer_LDADD = \ $(COMMON_TEST_LDADD) \ diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am index c23292e2..d010e2b0 100644 --- a/tests/utils/Makefile.am +++ b/tests/utils/Makefile.am @@ -1,3 +1,7 @@ SUBDIRS = tap + +noinst_LTLIBRARIES = libtestcommon.la +libtestcommon_la_SOURCES = common.c common.h + # Directories added to EXTRA_DIST will be recursively copied to the distribution. EXTRA_DIST = python diff --git a/tests/lib/common.c b/tests/utils/common.c similarity index 100% rename from tests/lib/common.c rename to tests/utils/common.c diff --git a/tests/lib/common.h b/tests/utils/common.h similarity index 100% rename from tests/lib/common.h rename to tests/utils/common.h -- 2.34.1