From 7d2eb84de0dec4fb4616d73736c6c340ba0cc42f Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 26 May 2007 10:26:38 +0200
Subject: [PATCH] Revert "Refactor test-sgml-parser-basic to work with non-bash
 shells"

This reverts commit 3f93148c9b131069aa5ee8b655652da40e1a4b70.
---
 src/dom/test/test-sgml-parser-basic | 37 ++++++++++-------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic
index 791bbf4a9..fc8e45e6b 100755
--- a/src/dom/test/test-sgml-parser-basic
+++ b/src/dom/test/test-sgml-parser-basic
@@ -11,28 +11,18 @@ correctly in the DOM tree.
 
 . "$TEST_LIB"
 
-test_output_equals_file () {
-	desc="$1"; shift
-	src="$1"; shift
-	file="$1"; shift
-
-	URI="test:$(normalize "$desc")"
-
-	sgml-parser --uri "$URI" --src "$src" > output
-	echo "#document: $URI" > expected
-	sed 's/^/  /' < "$file" >> expected
-
-	test_expect_success "$desc" 'cmp output expected' 
-}
-
 test_output_equals () {
 	desc="$1"; shift
 	src="$1"; shift
 	out="$1"; shift
 
-	echo "$out" | sed -n '2,$p' > expected+
+	URI="test:$(normalize "$desc")"
 
-	test_output_equals_file "$desc" "$src" "expected+"
+	sgml-parser --uri "$URI" --src "$src" > output
+	echo "#document: $URI" > expected
+	echo "$out" | sed -n '2,$p' | sed 's/^/  /' >> expected
+
+	test_expect_success "$desc" 'cmp output expected' 
 }
 
 
@@ -194,21 +184,18 @@ entity-reference: #
 #text: -
 entity-reference: #xx'
 
-cat > expected2 <<EOF
-proc-instruction: xml -> encoding="UTF8"
-  attribute: encoding -> UTF8
-#text: \\n...\\n
-proc-instruction: ecmascript -> var val=2;\\n
-EOF
-
-test_output_equals_file \
+test_output_equals \
 'Parse processing instructions.' \
 '<?xml encoding="UTF8"?>
 ...
 <?ecmascript
 var val=2;
 ?>' \
-expected2
+'
+proc-instruction: xml -> encoding="UTF8"
+  attribute: encoding -> UTF8
+#text: \n...\n
+proc-instruction: ecmascript -> var val=2;\n'
 
 test_output_equals \
 'Parse XML processing instructions.' \