[Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test

[Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test

[Gernot Hillier]

As there are two testdir occurences in one line, we need global regex replace.

Signed-off-by: Gernot Hillier <gernot.hillier@siemens.com>
---
 testsuite/xeno-test/Makefile.am | 2 +-
 testsuite/xeno-test/Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/xeno-test/Makefile.am b/testsuite/xeno-test/Makefile.am
index cd809ab..ce51b29 100644
--- a/testsuite/xeno-test/Makefile.am
+++ b/testsuite/xeno-test/Makefile.am
@@ -9,7 +9,7 @@ xeno_test_run_CPPFLAGS = -DTESTDIR=\"$(testdir)\" -D_GNU_SOURCE
 xeno_test_run_LDADD = -lpthread -lrt
 
 xeno-test: $(srcdir)/xeno-test.in Makefile
-	sed "s,@testdir@,$(testdir),;s,@pkgdir@,$(pkgdir)," $< > $@
+	sed "s,@testdir@,$(testdir),g;s,@pkgdir@,$(pkgdir)," $< > $@
 
 EXTRA_DIST = $(test_SCRIPTS) xeno-test.in
 
diff --git a/testsuite/xeno-test/Makefile.in b/testsuite/xeno-test/Makefile.in
index b3225e3..1a19dca 100644
--- a/testsuite/xeno-test/Makefile.in
+++ b/testsuite/xeno-test/Makefile.in
@@ -791,7 +791,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-testPROGRAMS \
 
 
 xeno-test: $(srcdir)/xeno-test.in Makefile
-	sed "s,@testdir@,$(testdir),;s,@pkgdir@,$(pkgdir)," $< > $@
+	sed "s,@testdir@,$(testdir),g;s,@pkgdir@,$(pkgdir)," $< > $@
 
 # 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.
-- 
1.8.1.2

-- 
Gernot Hillier

Siemens AG, Corporate Technology, CT RTC ITP SES-DE
Corporate Competence Center Embedded Linux

Re: [Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test

[Gilles Chanteperdrix]

On 11/07/2013 06:16 PM, Gernot Hillier wrote:
> As there are two testdir occurences in one line, we need global regex replace.

This issue should have been fixed already.

-- 
                                                                Gilles.

Re: [Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test

[Gernot Hillier]

Am 07.11.2013 18:39, schrieb Gilles Chanteperdrix:
> On 11/07/2013 06:16 PM, Gernot Hillier wrote:
>> As there are two testdir occurences in one line, we need global regex replace.
>
> This issue should have been fixed already.

In 2.6, yes. In -forge, no.

At least not according to 
http://git.xenomai.org/?p=xenomai-forge.git;a=tree;f=testsuite/xeno-test;h=6a795dc22461e375c55c9fb0504989443a12c17e;hb=HEAD

The patches I posted were all rebased to current -forge HEAD before posting.

-- 
Gernot

Re: [Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test

[Gilles Chanteperdrix]

On 11/08/2013 06:58 AM, Gernot Hillier wrote:
> Am 07.11.2013 18:39, schrieb Gilles Chanteperdrix:
>> On 11/07/2013 06:16 PM, Gernot Hillier wrote:
>>> As there are two testdir occurences in one line, we need global regex replace.
>>
>> This issue should have been fixed already.
> 
> In 2.6, yes. In -forge, no.

See commit 7e4b15dfae125f1d90719b4ed0ca1208c35c1b06

-- 
                                                                Gilles.