All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gernot Hillier <gernot.hillier@siemens.com>
To: xenomai@xenomai.org
Subject: [Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test
Date: Thu, 07 Nov 2013 18:16:59 +0100	[thread overview]
Message-ID: <527BCB0B.1010609@siemens.com> (raw)

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


             reply	other threads:[~2013-11-07 17:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-07 17:16 Gernot Hillier [this message]
2013-11-07 17:39 ` [Xenomai] [Xenomai-forge PATCH] testsuite: fix clocktest invocation in xeno-test Gilles Chanteperdrix
2013-11-08  5:58   ` Gernot Hillier
2013-11-08 14:40     ` Gilles Chanteperdrix

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=527BCB0B.1010609@siemens.com \
    --to=gernot.hillier@siemens.com \
    --cc=xenomai@xenomai.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.