From d2dcd0094901ca961a4690647d17f887eb26208f Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Tue, 2 Oct 2012 20:51:13 +0700 Subject: [PATCH] tests: simplify some shell code. * tests/fail.at: Simplify. * tests/static.at: Likewise. Signed-off-by: Gary V. Vaughan --- tests/fail.at | 4 ++-- tests/static.at | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/fail.at b/tests/fail.at index cdc2df791..90454a225 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 a2e87c959..44fa616d3 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 -- 2.47.2