From: Thomas Veerman <thomas@minix3.org>
Date: Fri, 7 Dec 2012 15:44:22 +0000 (+0000)
Subject: testsh?.sh: fix sort(1) invocations
X-Git-Tag: v3.2.1~161
X-Git-Url: http://zhaoyanbai.com/repos/named-checkzone.html?a=commitdiff_plain;h=11184894e2833b4b35d3ea6da41d66a7c96cdac3;p=minix.git

testsh?.sh: fix sort(1) invocations

Newly imported sort(1) works slightly differently. In fact, the old
sort(1) had a bug and the tests invoked sort(1) the wrong way.
---

diff --git a/test/testsh1.sh b/test/testsh1.sh
index 13407d9a0..0a9e20ff9 100755
--- a/test/testsh1.sh
+++ b/test/testsh1.sh
@@ -229,7 +229,7 @@ sort <x >x1
 if cmp -s y x1; then : ; else echo Error on sort test 2; fi
 sort -r <x1 >x2
 if cmp -s x2 z; then : ; else echo Error on sort test 3; fi
-sort +1 -n <x |head -1 >y
+sort -k 2n <x |head -1 >y
 echo "bibelot 3" >z
 if cmp -s y z; then : ; else echo Error on sort test 4; fi
 
diff --git a/test/testsh2.sh b/test/testsh2.sh
index 3ceb6b8a9..d55af2a3f 100755
--- a/test/testsh2.sh
+++ b/test/testsh2.sh
@@ -247,7 +247,7 @@ cat >answer <<END
 END
 
 prep x | sort | uniq -c >y1
-sort +1 <y1 >y
+sort <y1 >y
 if cmp -s y answer; then : ; else echo Error in pipeline test 1; fi
 
 cat $f $f $f | sort | uniq >x