[iwhd] unfuzz iwhd-1.0-debug.patch
Jim Meyering
meyering at fedoraproject.org
Tue Mar 6 15:51:19 UTC 2012
commit 71ed9a2e7742880b3b723a15cb9440fd2ec7bec6
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Mar 6 16:31:33 2012 +0100
unfuzz iwhd-1.0-debug.patch
iwhd-1.0-debug.patch | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/iwhd-1.0-debug.patch b/iwhd-1.0-debug.patch
index bac16b9..0bc1c95 100644
--- a/iwhd-1.0-debug.patch
+++ b/iwhd-1.0-debug.patch
@@ -24,39 +24,42 @@ iwhd: failed to start daemon: Address already in use
curl: (56) Recv failure: Connection reset by peer
Tue Nov 22 04:16:39 got kill or ctrl c or hup signal 15 (Terminated), will terminate after current cmd ends
-diff -ur iwhd-1.0~/t/auto iwhd-1.0/t/auto
---- iwhd-1.0~/t/auto 2011-10-20 03:22:07.000000000 -0600
-+++ iwhd-1.0/t/auto 2011-11-21 22:55:46.217143746 -0700
+diff --git a/t/auto b/t/auto
+index 5f7092d..01a2fb8 100755
+--- a/t/auto
++++ b/t/auto
@@ -5,7 +5,7 @@
-
+
mkdir FS mongod iwhd || framework_failure_ mkdir failed
-
+
-port=$(get_port 9095 $lock_dir/i-) || fail_ "failed to get iwhd port"
+port=$(get_port 9091 $lock_dir/i-) || fail_ "failed to get iwhd port"
m_port=27018 # auto-start default
-
+
printf '[{"path": "FS", "type": "fs", "name": "primary"}]\n' \
-diff -ur iwhd-1.0~/t/oauth iwhd-1.0/t/oauth
---- iwhd-1.0~/t/oauth 2011-10-20 12:13:00.000000000 -0600
-+++ iwhd-1.0/t/oauth 2011-11-21 22:56:39.865473050 -0700
-@@ -25,7 +25,7 @@
- wait_for .1 50 'mongo localhost:$m_port < /dev/null' \
+diff --git a/t/oauth b/t/oauth
+index 8dde2ef..e39f374 100755
+--- a/t/oauth
++++ b/t/oauth
+@@ -25,7 +25,7 @@ cleanup_() { kill -9 $mongo_pid; }
+ wait_for_mongo $m_port \
|| framework_failure_ mongod failed to start
-
+
-port=$(get_port 9095 $lock_dir/i-) || fail_ "failed to get iwhd port"
+port=$(get_port 9091 $lock_dir/i-) || fail_ "failed to get iwhd port"
-
+
ulimit -c unlimited
-
-diff -ur iwhd-1.0~/t/registration iwhd-1.0/t/registration
---- iwhd-1.0~/t/registration 2011-04-11 09:37:07.000000000 -0600
-+++ iwhd-1.0/t/registration 2011-11-21 22:56:21.523702357 -0700
+
+diff --git a/t/registration b/t/registration
+index a1114cd..b410ca5 100755
+--- a/t/registration
++++ b/t/registration
@@ -7,7 +7,7 @@
mkdir -p reg/mongod reg/_fs reg/condor/staging \
|| framework_failure_ mkdir failed
-
+
-port=$(get_port 9095 $lock_dir/i-) || fail_ "failed to get iwhd port"
+port=$(get_port 9091 $lock_dir/i-) || fail_ "failed to get iwhd port"
m_port=$(get_port $mongo_base_port $lock_dir/m-) \
|| fail_ "failed to get mongodb port"
-
+
More information about the scm-commits
mailing list