X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-select-in.sh;h=44f5dbb8e8562ab2f2467f89970badcb10500ef4;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=b93fee9a04802b28e8bee2a22f7db5bf70fa685a;hpb=69374b85907050e3c6d8f845d5c9846c0fb581de;p=gnulib.git

diff --git a/tests/test-select-in.sh b/tests/test-select-in.sh
index b93fee9a0..44f5dbb8e 100755
--- a/tests/test-select-in.sh
+++ b/tests/test-select-in.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 # Test select() on file descriptors opened for reading.
 
+# This test is known to fail on Solaris 2.6 and older, due to its handling
+# of /dev/null.
+
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
@@ -8,20 +11,26 @@ tmpfiles="$tmpfiles t-select-in.tmp"
 
 # Regular files.
 
-./test-select-fd${EXEEXT} r 0 < ./test-select-fd${EXEEXT} 2> t-select-in.tmp
+rm -f t-select-in.tmp
+./test-select-fd${EXEEXT} r 0 t-select-in.tmp < ./test-select-fd${EXEEXT}
 test `cat t-select-in.tmp` = "1" || exit 1
 
 # Pipes.
 
-{ sleep 1; echo abc; } | ./test-select-fd${EXEEXT} r 0 2> t-select-in.tmp
+rm -f t-select-in.tmp
+{ sleep 1; echo abc; } | \
+  { ./test-select-fd${EXEEXT} r 0 t-select-in.tmp; cat > /dev/null; }
 test `cat t-select-in.tmp` = "0" || exit 1
 
-echo abc | { sleep 1; ./test-select-fd${EXEEXT} r 0; } 2> t-select-in.tmp
+rm -f t-select-in.tmp
+echo abc | { sleep 1; ./test-select-fd${EXEEXT} r 0 t-select-in.tmp; }
 test `cat t-select-in.tmp` = "1" || exit 1
 
 # Special files.
+# This part of the test is known to fail on Solaris 2.6 and older.
 
-./test-select-fd${EXEEXT} r 0 < /dev/null 2> t-select-in.tmp
+rm -f t-select-in.tmp
+./test-select-fd${EXEEXT} r 0 t-select-in.tmp < /dev/null
 test `cat t-select-in.tmp` = "1" || exit 1
 
 rm -fr $tmpfiles