xalloc-die-tests: optimize

* tests/test-xalloc-die.sh: Reduce number of processes.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 33e9351cda9c9c4e780dfb158d9b20cfb74b0237..28897271b0fbb883c30427d52eec4a3101c131a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-17  Eric Blake  <ebb9@byu.net>
+
+       xalloc-die-tests: optimize
+       * tests/test-xalloc-die.sh: Reduce number of processes.
+
 2009-11-17  Simon Josefsson  <simon@josefsson.org>
 
        * gnulib-tool: Support LGPLv3+ licenses in module files.  Tiny

diff --git a/tests/test-xalloc-die.sh b/tests/test-xalloc-die.sh
index dc9bc37a6f66476b54352914cd64bda578c63941..4b0d2c2be9146a7f89a590d647e43288536b79b3 100755 (executable)
--- a/tests/test-xalloc-die.sh
+++ b/tests/test-xalloc-die.sh
@@ -30,7 +30,7 @@ fi
 
 tmpout=t-xalloc-die.tmp-stderr
 tmperr=t-xalloc-die.tmp-stdout
-tmpfiles="$tmpout $tmperr ${tmpout}2 ${tmperr}2"
+tmpfiles="$tmpout $tmperr ${tmperr}2"
 
 PATH=".:$PATH"
 export PATH
@@ -40,15 +40,13 @@ case $? in
   *) (exit 1); exit 1 ;;
 esac
 
-cat $tmperr | tr -d '\015' > ${tmperr}2
-cat $tmpout | tr -d '\015' > ${tmpout}2
+tr -d '\015' < $tmperr > ${tmperr}2 || { (exit 1); exit 1; }
 
 compare - ${tmperr}2 <<\EOF || { (exit 1); exit 1; }
 test-xalloc-die: memory exhausted
 EOF
 
-compare - ${tmpout}2 <<\EOF || { (exit 1); exit 1; }
-EOF
+test -s $tmpout && { (exit 1); exit 1; }
 
 rm -fr $tmpfiles