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

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Sun Aug  1 15:36:51 2010 +0200

testsuite: adapt "run" scripts to the --with-testdir option

---

 src/testsuite/clocktest/Makefile.am  |    2 +-
 src/testsuite/clocktest/Makefile.in  |    2 +-
 src/testsuite/clocktest/runinfo.in   |    2 +-
 src/testsuite/cyclic/Makefile.am     |    2 +-
 src/testsuite/cyclic/Makefile.in     |    2 +-
 src/testsuite/cyclic/runinfo.in      |    2 +-
 src/testsuite/irqbench/Makefile.am   |    2 +-
 src/testsuite/irqbench/Makefile.in   |    2 +-
 src/testsuite/irqbench/runinfo.in    |    2 +-
 src/testsuite/klatency/Makefile.am   |    2 +-
 src/testsuite/klatency/Makefile.in   |    2 +-
 src/testsuite/klatency/runinfo.in    |    2 +-
 src/testsuite/latency/Makefile.am    |    2 +-
 src/testsuite/latency/Makefile.in    |    2 +-
 src/testsuite/latency/runinfo.in     |    2 +-
 src/testsuite/sigtest/Makefile.am    |    2 +-
 src/testsuite/sigtest/Makefile.in    |    2 +-
 src/testsuite/sigtest/runinfo.in     |    2 +-
 src/testsuite/switchtest/Makefile.am |    2 +-
 src/testsuite/switchtest/Makefile.in |    2 +-
 src/testsuite/switchtest/runinfo.in  |    2 +-
 src/testsuite/unit/Makefile.am       |    2 +-
 src/testsuite/unit/Makefile.in       |    2 +-
 src/testsuite/unit/runinfo.in        |   10 +++++-----
 24 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/testsuite/clocktest/Makefile.am 
b/src/testsuite/clocktest/Makefile.am
index 14f1755..9698d2d 100644
--- a/src/testsuite/clocktest/Makefile.am
+++ b/src/testsuite/clocktest/Makefile.am
@@ -18,7 +18,7 @@ clocktest_LDADD = \
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/clocktest/Makefile.in 
b/src/testsuite/clocktest/Makefile.in
index 1888e40..a927cc1 100644
--- a/src/testsuite/clocktest/Makefile.in
+++ b/src/testsuite/clocktest/Makefile.in
@@ -586,7 +586,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/clocktest/runinfo.in 
b/src/testsuite/clocktest/runinfo.in
index 1fe03b9..f030d69 100644
--- a/src/testsuite/clocktest/runinfo.in
+++ b/src/testsuite/clocktest/runinfo.in
@@ -1 +1 @@
-clocktest:posix:!...@exec_prefix@/bin/clocktest;popall:control_c
+clocktest:posix:!...@xeno_test_dir@/clocktest;popall:control_c
diff --git a/src/testsuite/cyclic/Makefile.am b/src/testsuite/cyclic/Makefile.am
index a8ff9ff..bcf32f7 100644
--- a/src/testsuite/cyclic/Makefile.am
+++ b/src/testsuite/cyclic/Makefile.am
@@ -18,7 +18,7 @@ cyclictest_LDADD = \
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/cyclic/Makefile.in b/src/testsuite/cyclic/Makefile.in
index 058c5a4..b4871e4 100644
--- a/src/testsuite/cyclic/Makefile.in
+++ b/src/testsuite/cyclic/Makefile.in
@@ -586,7 +586,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/cyclic/runinfo.in b/src/testsuite/cyclic/runinfo.in
index f3012d4..9a82e5d 100644
--- a/src/testsuite/cyclic/runinfo.in
+++ b/src/testsuite/cyclic/runinfo.in
@@ -1 +1 @@
-cyclictest:posix:!...@exec_prefix@/bin/cyclictest -p 99 -n;popall:control_c
+cyclictest:posix:!...@xeno_test_dir@/cyclictest -p 99 -n;popall:control_c
diff --git a/src/testsuite/irqbench/Makefile.am 
b/src/testsuite/irqbench/Makefile.am
index 3e531c7..e5ea91f 100644
--- a/src/testsuite/irqbench/Makefile.am
+++ b/src/testsuite/irqbench/Makefile.am
@@ -37,7 +37,7 @@ irqbench_LDFLAGS = $(XENO_USER_LDFLAGS)
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/irqbench/Makefile.in 
b/src/testsuite/irqbench/Makefile.in
index 80f4aa9..4190599 100644
--- a/src/testsuite/irqbench/Makefile.in
+++ b/src/testsuite/irqbench/Makefile.in
@@ -625,7 +625,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/irqbench/runinfo.in 
b/src/testsuite/irqbench/runinfo.in
index 52ee69a..2725321 100644
--- a/src/testsuite/irqbench/runinfo.in
+++ b/src/testsuite/irqbench/runinfo.in
@@ -1 +1 @@
-irqloop:posix+rtdm+irqbench:!...@exec_prefix@/bin/irqloop;popall:control_c
+irqloop:posix+rtdm+irqbench:!...@xeno_test_dir@/irqloop;popall:control_c
diff --git a/src/testsuite/klatency/Makefile.am 
b/src/testsuite/klatency/Makefile.am
index 88d8480..df304b2 100644
--- a/src/testsuite/klatency/Makefile.am
+++ b/src/testsuite/klatency/Makefile.am
@@ -13,7 +13,7 @@ klatency_LDFLAGS = @XENO_USER_LDFLAGS@
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/klatency/Makefile.in 
b/src/testsuite/klatency/Makefile.in
index 3d4926b..f546b11 100644
--- a/src/testsuite/klatency/Makefile.in
+++ b/src/testsuite/klatency/Makefile.in
@@ -583,7 +583,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/klatency/runinfo.in 
b/src/testsuite/klatency/runinfo.in
index d116712..e550ff4 100644
--- a/src/testsuite/klatency/runinfo.in
+++ b/src/testsuite/klatency/runinfo.in
@@ -1 +1 @@
-latency:native+rtdm+timerbench+klat:!...@exec_prefix@/bin/klatency;popall:control_c
+latency:native+rtdm+timerbench+klat:!...@xeno_test_dir@/klatency;popall:control_c
diff --git a/src/testsuite/latency/Makefile.am 
b/src/testsuite/latency/Makefile.am
index 12000b3..700b452 100644
--- a/src/testsuite/latency/Makefile.am
+++ b/src/testsuite/latency/Makefile.am
@@ -19,7 +19,7 @@ latency_LDADD = \
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/latency/Makefile.in 
b/src/testsuite/latency/Makefile.in
index 27a3952..eae0150 100644
--- a/src/testsuite/latency/Makefile.in
+++ b/src/testsuite/latency/Makefile.in
@@ -590,7 +590,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/latency/runinfo.in b/src/testsuite/latency/runinfo.in
index 2a0df33..77ac8e4 100644
--- a/src/testsuite/latency/runinfo.in
+++ b/src/testsuite/latency/runinfo.in
@@ -1 +1 @@
-latency:native+rtdm+timerbench:!...@exec_prefix@/bin/latency;popall:control_c
+latency:native+rtdm+timerbench:!...@xeno_test_dir@/latency;popall:control_c
diff --git a/src/testsuite/sigtest/Makefile.am 
b/src/testsuite/sigtest/Makefile.am
index e99c09f..72c2624 100644
--- a/src/testsuite/sigtest/Makefile.am
+++ b/src/testsuite/sigtest/Makefile.am
@@ -21,7 +21,7 @@ sigtest_LDADD = \
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/sigtest/Makefile.in 
b/src/testsuite/sigtest/Makefile.in
index 301d644..2bb36ed 100644
--- a/src/testsuite/sigtest/Makefile.in
+++ b/src/testsuite/sigtest/Makefile.in
@@ -588,7 +588,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/sigtest/runinfo.in b/src/testsuite/sigtest/runinfo.in
index 1d89013..687b257 100644
--- a/src/testsuite/sigtest/runinfo.in
+++ b/src/testsuite/sigtest/runinfo.in
@@ -1 +1 @@
-sigtest:posix+rtdm+sigtest:!...@exec_prefix@/bin/sigtest;popall:control_c
+sigtest:posix+rtdm+sigtest:!...@xeno_test_dir@/sigtest;popall:control_c
diff --git a/src/testsuite/switchtest/Makefile.am 
b/src/testsuite/switchtest/Makefile.am
index 3d3423c..7650339 100644
--- a/src/testsuite/switchtest/Makefile.am
+++ b/src/testsuite/switchtest/Makefile.am
@@ -18,7 +18,7 @@ switchtest_LDADD = \
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/switchtest/Makefile.in 
b/src/testsuite/switchtest/Makefile.in
index 8b25442..d28c5c2 100644
--- a/src/testsuite/switchtest/Makefile.in
+++ b/src/testsuite/switchtest/Makefile.in
@@ -586,7 +586,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/switchtest/runinfo.in 
b/src/testsuite/switchtest/runinfo.in
index 102e832..c84e636 100644
--- a/src/testsuite/switchtest/runinfo.in
+++ b/src/testsuite/switchtest/runinfo.in
@@ -1 +1 @@
-switchtest:posix+rtdm+switchtest:!...@exec_prefix@/bin/switchtest;popall:control_c
+switchtest:posix+rtdm+switchtest:!...@xeno_test_dir@/switchtest;popall:control_c
diff --git a/src/testsuite/unit/Makefile.am b/src/testsuite/unit/Makefile.am
index f37ec33..c188250 100644
--- a/src/testsuite/unit/Makefile.am
+++ b/src/testsuite/unit/Makefile.am
@@ -122,7 +122,7 @@ rtdm_LDADD = \
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/unit/Makefile.in b/src/testsuite/unit/Makefile.in
index ab5c3c8..0d3c21a 100644
--- a/src/testsuite/unit/Makefile.in
+++ b/src/testsuite/unit/Makefile.in
@@ -876,7 +876,7 @@ uninstall-am: uninstall-local uninstall-testPROGRAMS
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
-       @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
+       @sed -e's,@XENO_TEST_DIR\@,$(XENO_TEST_DIR),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
        @echo "#!/bin/sh" > $(DESTDIR)$(rundir)/run
        @echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" 
>> $(DESTDIR)$(rundir)/run
        @chmod +x $(DESTDIR)$(rundir)/run
diff --git a/src/testsuite/unit/runinfo.in b/src/testsuite/unit/runinfo.in
index a22afc0..c577d30 100644
--- a/src/testsuite/unit/runinfo.in
+++ b/src/testsuite/unit/runinfo.in
@@ -1,5 +1,5 @@
-arith:native:!...@exec_prefix@/bin/arith;popall:control_c
-wakeup-time:native:!...@exec_prefix@/bin/wakeup-time;popall:control_c
-mutex-torture-posix:posix:!...@exec_prefix@/bin/mutex-torture-posix;popall:control_c
-mutex-torture-native:native:!...@exec_prefix@/bin/mutex-torture-native;popall:control_c
-xnvdso:native:!...@exec_prefix@/bin/xnvdso;popall:control_c
+arith:native:!...@xeno_test_dir@/arith;popall:control_c
+wakeup-time:native:!...@xeno_test_dir@/wakeup-time;popall:control_c
+mutex-torture-posix:posix:!...@xeno_test_dir@/mutex-torture-posix;popall:control_c
+mutex-torture-native:native:!...@xeno_test_dir@/mutex-torture-native;popall:control_c
+xnvdso:native:!...@xeno_test_dir@/xnvdso;popall:control_c


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

Reply via email to