Skip to contentSkip to conversation

testsuite: fix clocktest invocation in xeno-test

PATCH In review Gernot Hillier 2 participants 4 messages Nov 7, 2013 – Nov 8, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 testsuite: fix clocktest invocation in xeno-test

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

---
 testsuite/xeno-test/Makefile.am | 2 +-
 testsuite/xeno-test/Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
testsuite/xeno-test/Makefile.am +1 -1
index cd809ab..ce51b29 100644
@@ -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
 
testsuite/xeno-test/Makefile.in +1 -1
index b3225e3..1a19dca 100644
@@ -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.
Signature · 7 lines
1.8.1.2

-- 
Gernot Hillier

Siemens AG, Corporate Technology, CT RTC ITP SES-DE
Corporate Competence Center Embedded Linux
#1 lore raw
Quoted 1 line · Gernot Hillier

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

This issue should have been fixed already.

Signature · 1 line
                                                                Gilles.
#2 lore raw

Am 07.11.2013 18:39, schrieb Gilles Chanteperdrix:

Quoted 4 lines · Gernot Hillier
Quoted 1 line

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.

Signature · 1 line
Gernot
#3 lore raw
Quoted 7 lines · Gernot Hillier

Am 07.11.2013 18:39, schrieb Gilles Chanteperdrix:

Quoted 4 lines · Gernot Hillier
Quoted 1 line

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

Signature · 1 line
                                                                Gilles.