Module: xenomai-rpm
Branch: for-upstream
Commit: 34162f394f33a96ef45d63ba7fd9674ef55a648d
URL:
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=34162f394f33a96ef45d63ba7fd9674ef55a648d
Author: Philippe Gerum <r...@xenomai.org>
Date: Sun Feb 28 19:37:39 2010 +0100
testsuite/unit: make vdso test depend on fastsynch availability
---
src/testsuite/unit/Makefile.am | 10 ++++++++--
src/testsuite/unit/Makefile.in | 29 +++++++++++++++++------------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/testsuite/unit/Makefile.am b/src/testsuite/unit/Makefile.am
index c6188fb..4312c74 100644
--- a/src/testsuite/unit/Makefile.am
+++ b/src/testsuite/unit/Makefile.am
@@ -3,8 +3,10 @@ testdir = @XENO_TEST_DIR@
CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
-test_PROGRAMS = arith wakeup-time mutex-torture-posix mutex-torture-native \
- check-vdso
+test_PROGRAMS = arith wakeup-time mutex-torture-posix mutex-torture-native
+if CONFIG_XENO_FASTSYNCH
+test_PROGRAMS += check-vdso
+endif
arith_SOURCES = arith.c arith-noinline.c arith-noinline.h
@@ -55,6 +57,8 @@ mutex_torture_native_LDADD = \
../../skins/native/libnative.la \
-lpthread -lm
+if CONFIG_XENO_FASTSYNCH
+
check_vdso_SOURCES = check-vdso.c
check_vdso_CPPFLAGS = \
@@ -67,6 +71,8 @@ check_vdso_LDADD = \
../../skins/native/libnative.la \
-lpthread -lm
+endif
+
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(rundir)
@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in >
$(DESTDIR)$(rundir)/.runinfo
diff --git a/src/testsuite/unit/Makefile.in b/src/testsuite/unit/Makefile.in
index eab3b29..abc85a6 100644
--- a/src/testsuite/unit/Makefile.in
+++ b/src/testsuite/unit/Makefile.in
@@ -37,7 +37,8 @@ host_triplet = @host@
target_triplet = @target@
test_PROGRAMS = arith$(EXEEXT) wakeup-time$(EXEEXT) \
mutex-torture-posix$(EXEEXT) mutex-torture-native$(EXEEXT) \
- check-vdso$(EXEEXT)
+ $(am__EXEEXT_1)
+...@config_xeno_fastsynch_true@am__append_1 = check-vdso
subdir = src/testsuite/unit
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -55,6 +56,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/include/xeno_config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+...@config_xeno_fastsynch_true@am__EXEEXT_1 = check-vdso$(EXEEXT)
am__installdirs = "$(DESTDIR)$(testdir)"
PROGRAMS = $(test_PROGRAMS)
am_arith_OBJECTS = arith-arith.$(OBJEXT) \
@@ -64,9 +66,12 @@ arith_DEPENDENCIES = ../../skins/native/libnative.la
arith_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(arith_LDFLAGS) \
$(LDFLAGS) -o $@
-am_check_vdso_OBJECTS = check_vdso-check-vdso.$(OBJEXT)
+am__check_vdso_SOURCES_DIST = check-vdso.c
+...@config_xeno_fastsynch_true@am_check_vdso_OBJECTS = \
+...@config_xeno_fastsynch_true@ check_vdso-check-vdso.$(OBJEXT)
check_vdso_OBJECTS = $(am_check_vdso_OBJECTS)
-check_vdso_DEPENDENCIES = ../../skins/native/libnative.la
+...@config_xeno_fastsynch_true@check_vdso_DEPENDENCIES = \
+...@config_xeno_fastsynch_true@ ../../skins/native/libnative.la
check_vdso_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(check_vdso_LDFLAGS) $(LDFLAGS) -o $@
@@ -106,7 +111,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) \
SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
$(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
$(wakeup_time_SOURCES)
-DIST_SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
+DIST_SOURCES = $(arith_SOURCES) $(am__check_vdso_SOURCES_DIST) \
$(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
$(wakeup_time_SOURCES)
ETAGS = etags
@@ -316,15 +321,15 @@ mutex_torture_native_LDADD = \
../../skins/native/libnative.la \
-lpthread -lm
-check_vdso_SOURCES = check-vdso.c
-check_vdso_CPPFLAGS = \
- @XENO_USER_CFLAGS@ \
- -I$(top_srcdir)/include
+...@config_xeno_fastsynch_true@check_vdso_SOURCES = check-vdso.c
+...@config_xeno_fastsynch_true@check_vdso_CPPFLAGS = \
+...@config_xeno_fastsynch_true@ @XENO_USER_CFLAGS@ \
+...@config_xeno_fastsynch_true@ -I$(top_srcdir)/include
-check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
-check_vdso_LDADD = \
- ../../skins/native/libnative.la \
- -lpthread -lm
+...@config_xeno_fastsynch_true@check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
+...@config_xeno_fastsynch_true@check_vdso_LDADD = \
+...@config_xeno_fastsynch_true@ ../../skins/native/libnative.la \
+...@config_xeno_fastsynch_true@ -lpthread -lm
EXTRA_DIST = runinfo.in
all: all-am
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
