From 560dad02c3a8421b4895f2c08c43ce12f42d1ee0 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 8 Oct 2014 01:14:57 +0100
Subject: maint: avoid syntax-check failures in previous patch

* tests/misc/od-j.sh: Non standard comparison order.
* tests/split/b-chunk.sh: Confusing input file name.
* tests/tail-2/tail-c.sh: Redundant require ulimit.
---
 tests/misc/od-j.sh     | 6 +++---
 tests/split/b-chunk.sh | 6 +++---
 tests/tail-2/tail-c.sh | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/misc/od-j.sh b/tests/misc/od-j.sh
index a40a99ff7..1a4732876 100755
--- a/tests/misc/od-j.sh
+++ b/tests/misc/od-j.sh
@@ -27,13 +27,13 @@ for file in ${srcdir=.}/tests/init.sh /proc/version /sys/kernel/profiling; do
 
   od -An $file > exp || fail=1
   od -An -j $bytes $file $file > out || fail=1
-  compare out exp || fail=1
+  compare exp out || fail=1
 
   od -An -j 4096 copy copy > exp1 2> experr1; expstatus=$?
   od -An -j 4096 $file $file > out1 2> err1; status=$?
   test $status -eq $expstatus || fail=1
-  compare out1 exp1 || fail=1
-  compare err1 experr1 || fail=1
+  compare exp1 out1 || fail=1
+  compare experr1 err1 || fail=1
 done
 
 Exit $fail
diff --git a/tests/split/b-chunk.sh b/tests/split/b-chunk.sh
index fefa0900d..5938a7444 100755
--- a/tests/split/b-chunk.sh
+++ b/tests/split/b-chunk.sh
@@ -29,16 +29,16 @@ rm -f x??
 split -e -n 10 /dev/null || fail=1
 stat x?? 2>/dev/null && fail=1
 
-printf '1\n2\n3\n4\n5\n' > in || framework_failure_
+printf '1\n2\n3\n4\n5\n' > input || framework_failure_
 
-for file in in /proc/version /sys/kernel/profiling; do
+for file in input /proc/version /sys/kernel/profiling; do
   split -n 3 $file > out || fail=1
   split -n 1/3 $file > b1 || fail=1
   split -n 2/3 $file > b2 || fail=1
   split -n 3/3 $file > b3 || fail=1
 
   case $file in
-    in)
+    input)
       printf '1\n2' > exp-1
       printf '\n3\n' > exp-2
       printf '4\n5\n' > exp-3
diff --git a/tests/tail-2/tail-c.sh b/tests/tail-2/tail-c.sh
index cdbaa46a9..438509ef8 100755
--- a/tests/tail-2/tail-c.sh
+++ b/tests/tail-2/tail-c.sh
@@ -18,7 +18,6 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ tail
-require_ulimit_v_
 
 # Make sure it works on funny files in /proc and /sys.
 
-- 
cgit v1.2.3-54-g00ecf