test runner is back up (thanks davisp), and tests pass in safari again (e4x syntax fix)

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@730656 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 3 deletions

diff --git a/test/runner.sh b/test/runner.sh
index e920090d..561110a8 100755
--- a/test/runner.sh
+++ b/test/runner.sh
@@ -4,4 +4,4 @@ erlc runner.erl
 
 erl -noshell -pa ../src/couchdb -pa ../src/mochiweb -eval "runner:run()"
 
-cat ../share/www/script/couch.js ../share/www/script/couch_tests.js test.js  | ../src/couchdb/couchjs -
+cat ../share/www/script/couch.js ../share/www/script/couch_test_runner.js ../share/www/script/couch_tests.js test.js  | ../src/couchdb/couchjs -
diff --git a/test/test.js b/test/test.js
index e47153bd..a4aa32e1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -67,8 +67,7 @@ var HTTP = (function() {
           var h = headers[i];
           if (keymatcher.test(h)) {
             var value = h.substr(key.length+2);
-            value = value.slice(0, value.length-1);
-            return value;
+            return value.replace(/^\s+|\s+$/g,"");
           }
         }
         return "";