projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Correct use of taskset in snapshot tests
[lttng-tools.git]
/
tests
/
regression
/
ust
/
linking
/
Makefile.am
diff --git
a/tests/regression/ust/linking/Makefile.am
b/tests/regression/ust/linking/Makefile.am
index 9f7ebecb9e8d8d3dbe1de3ae93d29af653c6d99d..5edcb9374b5283d8def88a8022b71318f4f1424a 100644
(file)
--- a/
tests/regression/ust/linking/Makefile.am
+++ b/
tests/regression/ust/linking/Makefile.am
@@
-1,6
+1,15
@@
+# SPDX-License-Identifier: GPL-2.0-only
+
# -Wsystem-headers is needed to print warnings in the tracepoint
# description file.
# -Wsystem-headers is needed to print warnings in the tracepoint
# description file.
-AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -Wsystem-headers
+#
+# However, we see some -Wformat-nonliteral warnings in some system headers,
+# so disable that.
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers -Wno-format-nonliteral
+
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+ -Wno-redundant-decls
# Set LIBS to nothing so the application does not link on useless
# libraries.
# Set LIBS to nothing so the application does not link on useless
# libraries.
@@
-9,8
+18,8
@@
LIBS =
# Build a version of the test app with built-in tracepoints
demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
ust_tests_demo2.h ust_tests_demo3.h
# Build a version of the test app with built-in tracepoints
demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
ust_tests_demo2.h ust_tests_demo3.h
-demo_builtin_LDADD =
-llttng-ust
-demo_builtin_CFLAGS = -Werror=old-style-definition
+demo_builtin_LDADD =
$(UST_LIBS) $(DL_LIBS)
+demo_builtin_CFLAGS = -Werror=old-style-definition
$(AM_CFLAGS)
# Build a version statically linked to the providers
# contains ust_tests_demo.h and ust_tests_demo2.h provider probes
# Build a version statically linked to the providers
# contains ust_tests_demo.h and ust_tests_demo2.h provider probes
@@
-21,30
+30,31
@@
liblttng_ust_provider_ust_tests_demo_static_la_SOURCES = \
tp.c ust_tests_demo.h \
tp2.c ust_tests_demo2.h
liblttng_ust_provider_ust_tests_demo_static_la_LIBADD = \
tp.c ust_tests_demo.h \
tp2.c ust_tests_demo2.h
liblttng_ust_provider_ust_tests_demo_static_la_LIBADD = \
- -llttng-ust
+ $(UST_LIBS)
# contains ust_tests_demo3.h provider probes
liblttng_ust_provider_ust_tests_demo3_static_la_SOURCES = \
tp3.c ust_tests_demo3.h
liblttng_ust_provider_ust_tests_demo3_static_la_LIBADD = \
# contains ust_tests_demo3.h provider probes
liblttng_ust_provider_ust_tests_demo3_static_la_SOURCES = \
tp3.c ust_tests_demo3.h
liblttng_ust_provider_ust_tests_demo3_static_la_LIBADD = \
- -llttng-ust
+ $(UST_LIBS)
demo_static_SOURCES = demo.c
demo_static_LDADD = liblttng-ust-provider-ust-tests-demo-static.la \
demo_static_SOURCES = demo.c
demo_static_LDADD = liblttng-ust-provider-ust-tests-demo-static.la \
- liblttng-ust-provider-ust-tests-demo3-static.la
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-demo_builtin_LDADD += -ldl
-demo_static_LDADD += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-demo_builtin_LDADD += -lc
-demo_static_LDADD += -lc
-endif
+ liblttng-ust-provider-ust-tests-demo3-static.la \
+ $(DL_LIBS)
noinst_PROGRAMS = demo_builtin demo_static
noinst_PROGRAMS = demo_builtin demo_static
-if !NO_SHARED
+COPYSCRIPTS = test_linking test_linking.py demo_preload
+noinst_SCRIPTS = $(COPYSCRIPTS)
+
+if NO_SHARED
+
+EXTRA_DIST = tp.c ust_tests_demo.h tp2.c ust_tests_demo2.h \
+ tp3.c ust_tests_demo3.h demo.c ust_tests_demo.h \
+ $(COPYSCRIPTS)
+
+else
# Force the shared flag on the noinst libraries since they are
# only built static by default
FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
# Force the shared flag on the noinst libraries since they are
# only built static by default
FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
@@
-57,43
+67,36
@@
noinst_LTLIBRARIES += liblttng-ust-provider-ust-tests-demo.la \
liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
tp.c ust_tests_demo.h \
tp2.c ust_tests_demo2.h
liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
tp.c ust_tests_demo.h \
tp2.c ust_tests_demo2.h
-liblttng_ust_provider_ust_tests_demo_la_LIBADD =
-llttng-ust
+liblttng_ust_provider_ust_tests_demo_la_LIBADD =
$(UST_LIBS)
liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = \
$(FORCE_SHARED_LIB_OPTIONS)
#contains ust_tests_demo3.h provider probes
liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
tp3.c ust_tests_demo3.h
liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = \
$(FORCE_SHARED_LIB_OPTIONS)
#contains ust_tests_demo3.h provider probes
liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
tp3.c ust_tests_demo3.h
-liblttng_ust_provider_ust_tests_demo3_la_LIBADD =
-llttng-ust
+liblttng_ust_provider_ust_tests_demo3_la_LIBADD =
$(UST_LIBS)
liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
$(FORCE_SHARED_LIB_OPTIONS)
noinst_PROGRAMS += demo
demo_SOURCES = demo.c ust_tests_demo.h
liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
$(FORCE_SHARED_LIB_OPTIONS)
noinst_PROGRAMS += demo
demo_SOURCES = demo.c ust_tests_demo.h
-demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE
+demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE $(AM_CFLAGS)
+demo_LDADD = $(DL_LIBS)
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-demo_LDADD = -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-demo_LDADD = -lc
-endif
+EXTRA_DIST = $(COPYSCRIPTS)
endif
endif
-noinst_SCRIPTS = test_linking test_linking.py demo_preload
-EXTRA_DIST = test_linking test_linking.py demo_preload
-
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for script in $(
EXTRA_DIST
); do \
+ for script in $(
COPYSCRIPTS
); do \
cp -f $(srcdir)/$$script $(builddir); \
done; \
fi
clean-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
cp -f $(srcdir)/$$script $(builddir); \
done; \
fi
clean-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for script in $(
EXTRA_DIST
); do \
+ for script in $(
COPYSCRIPTS
); do \
rm -f $(builddir)/$$script; \
done; \
fi
rm -f $(builddir)/$$script; \
done; \
fi
This page took
0.025667 seconds
and
4
git commands to generate.