Module: xenomai-2.6
Branch: master
Commit: 50c68435411926fc784f90a0b1fbef89441f538c
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=50c68435411926fc784f90a0b1fbef89441f538c

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Wed Nov  9 13:11:32 2011 +0100

testsuite: install regression testsuite with other tests

---

 src/testsuite/regression/Makefile.am              |    3 +--
 src/testsuite/regression/Makefile.in              |    3 +--
 src/testsuite/regression/native+posix/Makefile.am |    2 +-
 src/testsuite/regression/native+posix/Makefile.in |    2 +-
 src/testsuite/regression/native/Makefile.am       |    2 +-
 src/testsuite/regression/native/Makefile.in       |    2 +-
 src/testsuite/regression/posix/Makefile.am        |    2 +-
 src/testsuite/regression/posix/Makefile.in        |    2 +-
 src/testsuite/regression/xeno-regression-test.in  |   14 +++++++-------
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/testsuite/regression/Makefile.am 
b/src/testsuite/regression/Makefile.am
index 0fed142..be47105 100644
--- a/src/testsuite/regression/Makefile.am
+++ b/src/testsuite/regression/Makefile.am
@@ -1,12 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4
 
 testdir = @XENO_TEST_DIR@
-pkgdir = $(pkgdatadir)
 
 bin_SCRIPTS = xeno-regression-test
 
 xeno-regression-test: $(srcdir)/xeno-regression-test.in Makefile
-       sed "s,@testdir@,$(testdir),;s,@pkgdir@,$(pkgdir)," $< > $@
+       sed "s,@testdir@,$(testdir)," $< > $@
 
 SUBDIRS = native posix native+posix
 
diff --git a/src/testsuite/regression/Makefile.in 
b/src/testsuite/regression/Makefile.in
index 9b6fe36..6e268d1 100644
--- a/src/testsuite/regression/Makefile.in
+++ b/src/testsuite/regression/Makefile.in
@@ -274,7 +274,6 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 testdir = @XENO_TEST_DIR@
-pkgdir = $(pkgdatadir)
 bin_SCRIPTS = xeno-regression-test
 SUBDIRS = native posix native+posix
 EXTRA_DIST = xeno-regression-test.in
@@ -666,7 +665,7 @@ uninstall-am: uninstall-binSCRIPTS
 
 
 xeno-regression-test: $(srcdir)/xeno-regression-test.in Makefile
-       sed "s,@testdir@,$(testdir),;s,@pkgdir@,$(pkgdir)," $< > $@
+       sed "s,@testdir@,$(testdir)," $< > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/testsuite/regression/native+posix/Makefile.am 
b/src/testsuite/regression/native+posix/Makefile.am
index 829caf9..385bb7d 100644
--- a/src/testsuite/regression/native+posix/Makefile.am
+++ b/src/testsuite/regression/native+posix/Makefile.am
@@ -1,4 +1,4 @@
-tstdir = $(pkgdatadir)/regression/native+posix
+tstdir = @XENO_TEST_DIR@/regression/native+posix
 
 tst_PROGRAMS = mq_select
 
diff --git a/src/testsuite/regression/native+posix/Makefile.in 
b/src/testsuite/regression/native+posix/Makefile.in
index 52d2057..1fa8794 100644
--- a/src/testsuite/regression/native+posix/Makefile.in
+++ b/src/testsuite/regression/native+posix/Makefile.in
@@ -237,7 +237,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-tstdir = $(pkgdatadir)/regression/native+posix
+tstdir = @XENO_TEST_DIR@/regression/native+posix
 INCLUDES = -I$(srcdir)/..
 LDADD = \
        ../../../skins/native/libnative.la \
diff --git a/src/testsuite/regression/native/Makefile.am 
b/src/testsuite/regression/native/Makefile.am
index 8f19c11..bb783d2 100644
--- a/src/testsuite/regression/native/Makefile.am
+++ b/src/testsuite/regression/native/Makefile.am
@@ -1,4 +1,4 @@
-tstdir = $(pkgdatadir)/regression/native
+tstdir = @XENO_TEST_DIR@/regression/native
 
 noinst_HEADERS = check.h
 
diff --git a/src/testsuite/regression/native/Makefile.in 
b/src/testsuite/regression/native/Makefile.in
index 1d88cde..b215d56 100644
--- a/src/testsuite/regression/native/Makefile.in
+++ b/src/testsuite/regression/native/Makefile.in
@@ -257,7 +257,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-tstdir = $(pkgdatadir)/regression/native
+tstdir = @XENO_TEST_DIR@/regression/native
 noinst_HEADERS = check.h
 LDADD = \
        ../../../skins/native/libnative.la \
diff --git a/src/testsuite/regression/posix/Makefile.am 
b/src/testsuite/regression/posix/Makefile.am
index 0bf8bc0..c397afd 100644
--- a/src/testsuite/regression/posix/Makefile.am
+++ b/src/testsuite/regression/posix/Makefile.am
@@ -1,4 +1,4 @@
-tstdir = $(pkgdatadir)/regression/posix
+tstdir = @XENO_TEST_DIR@/regression/posix
 
 noinst_HEADERS = check.h
 
diff --git a/src/testsuite/regression/posix/Makefile.in 
b/src/testsuite/regression/posix/Makefile.in
index 9a91081..747a0a3 100644
--- a/src/testsuite/regression/posix/Makefile.in
+++ b/src/testsuite/regression/posix/Makefile.in
@@ -243,7 +243,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-tstdir = $(pkgdatadir)/regression/posix
+tstdir = @XENO_TEST_DIR@/regression/posix
 noinst_HEADERS = check.h
 LDADD = \
        ../../../skins/posix/libpthread_rt.la \
diff --git a/src/testsuite/regression/xeno-regression-test.in 
b/src/testsuite/regression/xeno-regression-test.in
index fe18787..d241eec 100644
--- a/src/testsuite/regression/xeno-regression-test.in
+++ b/src/testsuite/regression/xeno-regression-test.in
@@ -46,13 +46,13 @@ echo 0 > /proc/xenomai/latency || :
 @testdir@/mutex-torture-posix
 
 # the tests in this tree
-@pkgdir@/regression/posix/leaks
-@pkgdir@/regression/posix/shm
-@pkgdir@/regression/native/heap
-@pkgdir@/regression/native/leaks
-@pkgdir@/regression/native/mayday
-@pkgdir@/regression/native/tsc
-@pkgdir@/regression/native+posix/mq_select
+@testdir@/regression/posix/leaks
+@testdir@/regression/posix/shm
+@testdir@/regression/native/heap
+@testdir@/regression/native/leaks
+@testdir@/regression/native/mayday
+@testdir@/regression/native/tsc
+@testdir@/regression/native+posix/mq_select
 
 start_load
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to