summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-17 20:12:57 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-17 20:12:57 +1000
commit044f32f4c6fd342f9f5949bb0ca77624c0db4494 (patch)
treec294a0961c7ce9a81160cafb73e5f31a77bfffd9
parent9cc8ff7b63f175661c8807006f6d2649d56ac402 (diff)
- (dtucker) [regress/cfgmatch.sh] Remove unneeded sleep renderd obsolete by
rev 1.6 which calls wait.
-rw-r--r--ChangeLog2
-rw-r--r--regress/cfgmatch.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26a183cba..f4be9bc9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,8 @@
85 - (dtucker) [regress/stderr-after-eof.sh regress/test-exec.sh] Move the md5 85 - (dtucker) [regress/stderr-after-eof.sh regress/test-exec.sh] Move the md5
86 helper function to the portable part of test-exec.sh. 86 helper function to the portable part of test-exec.sh.
87 - (dtucker) [regress/runtests.sh] Remove obsolete test driver script. 87 - (dtucker) [regress/runtests.sh] Remove obsolete test driver script.
88 - (dtucker) [regress/cfgmatch.sh] Remove unneeded sleep renderd obsolete by
89 rev 1.6 which calls wait.
88 90
8920130516 9120130516
90 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 92 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh
index e5907354b..80cf22930 100644
--- a/regress/cfgmatch.sh
+++ b/regress/cfgmatch.sh
@@ -34,7 +34,6 @@ stop_client()
34 pid=`cat $pidfile` 34 pid=`cat $pidfile`
35 if [ ! -z "$pid" ]; then 35 if [ ! -z "$pid" ]; then
36 kill $pid 36 kill $pid
37 sleep 1
38 fi 37 fi
39 wait 38 wait
40} 39}