commit d2dcd0094901ca961a4690647d17f887eb26208f
author Gary V. Vaughan <gary@gnu.org> Tue Oct 02 20:51:13 2012 +0700
committer Gary V. Vaughan <gary@gnu.org> Tue Oct 02 21:08:04 2012 +0700
tree 35069be609818cfd2f8c16bdeed38fc2a05663ff
parent aab804836706faa5538b56f5b4bfe5af6f2b048b

tests: simplify some shell code.

* tests/fail.at: Simplify.
* tests/static.at: Likewise.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

tests/fail.at

diff --git a/tests/fail.at b/tests/fail.at
index cdc2df7..90454a2 100644
--- a/tests/fail.at
+++ b/tests/fail.at
@@ -103,8 +103,8 @@
   $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c.c
   (
     . ./c.lo
-    test none != "$pic_object" && echo choke me >"$pic_object"
-    test none != "$non_pic_object" && echo choke me >"$non_pic_object"
+    test none = "$pic_object"     || echo choke me >"$pic_object"
+    test none = "$non_pic_object" || echo choke me >"$non_pic_object"
   )
   FAIL_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo])
   AT_CHECK([test -f liba.la], [1])

tests/static.at

diff --git a/tests/static.at b/tests/static.at
index a2e87c9..44fa616 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -141,9 +141,7 @@
 
 func_restore_path ()
 {
-  if test PATH = "$shlibpath_var"; then
-    PATH=$save_PATH
-  fi
+  test PATH = "$shlibpath_var" && PATH=$save_PATH
 }
 
 # func_move_libs srcdir_to_move prefix_to_move other_prefix other_prefix