[PATCH] Fix recommended test command

Subsystems: kernel build + files below scripts/ (unless maintained elsewhere), the rest

STALE5041d

2 messages, 2 authors, 2012-11-18 · open the first message on its own page

[PATCH] Fix recommended test command

From: Gilles Espinasse <hidden>
Date: 2012-11-17 12:37:53

Signed-off-by: Gilles Espinasse <redacted>

Recommended 'sh ./test' fail with
LANG=C sudo sh ./test
./test: line 73: `ctrl-c': not a valid identifier

Replace '-' by '_' in the ctrl-c function name fix that.
In the same time, update the recommended command to 'bash ./test' to match the shebang
---
 Makefile |    2 +-
 test     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d99ea2b..94229fa 100644
--- a/Makefile
+++ b/Makefile
@@ -268,7 +268,7 @@ uninstall:
 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
 
 test: mdadm mdmon test_stripe swap_super
-	@echo "Please run 'sh ./test' as root"
+	@echo "Please run 'bash ./test' as root"
 
 clean : 
 	rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
diff --git a/test b/test
index 3f8515f..a3c2a24 100755
--- a/test
+++ b/test
@@ -68,13 +68,13 @@ cleanup() {
 	done
 }
 
-ctrl-c() {
+ctrl_c() {
 	exitonerror=1
 }
 
 do_setup() {
   trap cleanup 0 1 3 15
-  trap ctrl-c 2
+  trap ctrl_c 2
 
   devlist=
   for d in 0 1 2 3 4 5 6 7 8 9 10 11 12
-- 
1.7.2.5

Re: [PATCH] Fix recommended test command

From: NeilBrown <hidden>
Date: 2012-11-18 23:03:18

On Sat, 17 Nov 2012 13:37:53 +0100 Gilles Espinasse [off-list ref] wrote:
Signed-off-by: Gilles Espinasse <redacted>

Recommended 'sh ./test' fail with
LANG=C sudo sh ./test
./test: line 73: `ctrl-c': not a valid identifier

Replace '-' by '_' in the ctrl-c function name fix that.
Thanks.  I already have fixed that .. but I haven't pushed it out yet.  I
should  do that - later today.

In the same time, update the recommended command to 'bash ./test' to match the shebang
Maybe should just make it:
   ./test

as it has "#!/bin/bash" at the top.  I might fix that too.

Thanks,
NeilBrown

quoted hunk
---
 Makefile |    2 +-
 test     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d99ea2b..94229fa 100644
--- a/Makefile
+++ b/Makefile
@@ -268,7 +268,7 @@ uninstall:
 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
 
 test: mdadm mdmon test_stripe swap_super
-	@echo "Please run 'sh ./test' as root"
+	@echo "Please run 'bash ./test' as root"
 
 clean : 
 	rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
diff --git a/test b/test
index 3f8515f..a3c2a24 100755
--- a/test
+++ b/test
@@ -68,13 +68,13 @@ cleanup() {
 	done
 }
 
-ctrl-c() {
+ctrl_c() {
 	exitonerror=1
 }
 
 do_setup() {
   trap cleanup 0 1 3 15
-  trap ctrl-c 2
+  trap ctrl_c 2
 
   devlist=
   for d in 0 1 2 3 4 5 6 7 8 9 10 11 12

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help