summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary V. Vaughan <gary@gnu.org>2012-10-02 20:51:13 +0700
committerGary V. Vaughan <gary@gnu.org>2012-10-02 21:08:04 +0700
commitd2dcd0094901ca961a4690647d17f887eb26208f (patch)
tree35069be609818cfd2f8c16bdeed38fc2a05663ff
parentaab804836706faa5538b56f5b4bfe5af6f2b048b (diff)
downloadlibtool-gary/reredo-test-operand-order.tar.gz
tests: simplify some shell code.gary/reredo-test-operand-order
* tests/fail.at: Simplify. * tests/static.at: Likewise. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r--tests/fail.at4
-rw-r--r--tests/static.at4
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/fail.at b/tests/fail.at
index cdc2df79..90454a22 100644
--- a/tests/fail.at
+++ b/tests/fail.at
@@ -103,8 +103,8 @@ case $build_libtool_libs in yes)
$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])
diff --git a/tests/static.at b/tests/static.at
index a2e87c95..44fa616d 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -141,9 +141,7 @@ func_fix_path ()
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