From: Brian Gernhardt <brian@gernhardtsoftware.com>
Date: Mon, 23 Nov 2009 17:33:42 +0000 (-0500)
Subject: t/gitweb-lib: Split HTTP response with non-GNU sed
X-Git-Tag: v1.6.6-rc1~39^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f74a83fcf04c50e8358c8fb493539af13f9b9aa5;p=git.git

t/gitweb-lib: Split HTTP response with non-GNU sed

Recognizing \r in a regex is something GNU sed will do, but other sed
implementation's won't (e.g. BSD sed on OS X).  Instead of two sed
invocations, use a single Perl script to split output into headers
and body.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index 32b841dd2..76d8b7b80 100644
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -52,8 +52,18 @@ gitweb_run () {
 	rm -f gitweb.log &&
 	perl -- "$SCRIPT_NAME" \
 		>gitweb.output 2>gitweb.log &&
-	sed -e   '/^\r$/q' <gitweb.output >gitweb.headers &&
-	sed -e '1,/^\r$/d' <gitweb.output >gitweb.body    &&
+	perl -w -e '
+		open O, ">gitweb.headers";
+		while (<>) {
+			print O;
+			last if (/^\r$/ || /^$/);
+		}
+		open O, ">gitweb.body";
+		while (<>) {
+			print O;
+		}
+		close O;
+	' gitweb.output &&
 	if grep '^[[]' gitweb.log >/dev/null 2>&1; then false; else true; fi
 
 	# gitweb.log is left for debugging