syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.

To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.

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

27 files changed, 48 insertions, 48 deletions

diff --git a/tests/bindir.at b/tests/bindir.at
index 5d76f8ba..33fd1daf 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -182,7 +182,7 @@ case $host_os in
 esac
 
 eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
-AT_CHECK([test "$build_libtool_libs" = yes || exit 77])
+AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
 
 ####
 # These routines save the PATH before a test and restore it after,
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 2e24f304..6cfe9788 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -330,7 +330,7 @@ func_exec ()
     if eval $my_program $my_exp_output; then :
     else
       shift
-      test "x$1" = x || shift
+      test -z "$1" || shift
       func_error "$0: cannot execute $my_program ${1+$@}"
 
       if test "$build" != "$host"; then
diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index 8310e46c..b463441c 100755
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -65,7 +65,7 @@ rm -f libhello.la "$objdir"/libhello.*
 func_msg "running demo/hell"
 if ./hell$EXEEXT; then
   :
-elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
+elif test relink,yes = "$hardcode_action,$hardcode_direct"; then
   func_msg "Ok, uninstalled programs fail after uninstalled libraries are removed."
   func_msg "This works in other configurations, but not in this particular one."
 else
@@ -85,12 +85,12 @@ else
   func_msg "Failed, as expected"
 fi
 
-if test "x$hardcode_action" = xrelink; then
+if test relink = "$hardcode_action"; then
   func_msg "Exiting: install-time relinking is required"
   exit $EXIT_SUCCESS
 fi
 
-if test "$shlibpath_overrides_runpath" != yes; then
+if test yes != "$shlibpath_overrides_runpath"; then
   rm -f $objdir/lt-hell$EXEEXT || exit $EXIT_FAILURE
   cp $objdir/hell$EXEEXT $objdir/lt-hell$EXEEXT || exit $EXIT_FAILURE
   func_msg "running demo/hell with installed libhello.la"
diff --git a/tests/demo/configure.ac b/tests/demo/configure.ac
index 7a844415..27a0da56 100644
--- a/tests/demo/configure.ac
+++ b/tests/demo/configure.ac
@@ -51,13 +51,13 @@ LT_INIT([dlopen win32-dll])
 AC_SUBST([LIBTOOL_DEPS])
 
 STATIC=
-test "X$enable_static" = Xyes && STATIC=-static
+test yes = "$enable_static" && STATIC=-static
 AC_SUBST([STATIC])
 
 case $lt_cv_sys_global_symbol_pipe in
   ?*) binary_helldl=yes ;;
 esac
-AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
+AM_CONDITIONAL([BINARY_HELLDL], [test yes = "$binary_helldl"])
 
 
 ## --------------------------- ##
diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index cf5c695f..382f36cc 100755
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -80,7 +80,7 @@ if ./depdemo$EXEEXT ||
    # but it's definitely not enough of a reason for the test to fail.
    ./depdemo$EXEEXT -alt; then
   :
-elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
+elif test relink,yes = "$hardcode_action,$hardcode_direct"; then
   func_msg "Ok, uninstalled programs fail after uninstalled libraries are removed"
   func_msg "This works in other configurations, but not in this particular one"
 elif test "$build" != "$host"; then
@@ -107,12 +107,12 @@ else
   func_msg "Failed, as expected"
 fi
 
-if test "x$hardcode_action" = xrelink; then
+if test relink = "$hardcode_action"; then
   func_msg "Exiting: install-time relinking is required"
   exit $EXIT_SUCCESS
 fi
 
-if test "$shlibpath_overrides_runpath" != yes; then
+if test yes != "$shlibpath_overrides_runpath"; then
   rm -f $objdir/lt-depdemo || exit $EXIT_FAILURE
   cp $objdir/depdemo $objdir/lt-depdemo || exit $EXIT_FAILURE
   func_msg "running depdemo/depdemo with installed libl3.la"
diff --git a/tests/destdir.at b/tests/destdir.at
index 386c7287..cfceb238 100644
--- a/tests/destdir.at
+++ b/tests/destdir.at
@@ -127,7 +127,7 @@ done
 LT_AT_EXEC_CHECK([$bindir/m$EXEEXT])
 
 # TODO: make this more portable:
-if test "$OBJDUMP" != false && ($OBJDUMP -p $bindir/m$EXEEXT) >/dev/null 2>&1; then
+if test false != "$OBJDUMP" && ($OBJDUMP -p $bindir/m$EXEEXT) >/dev/null 2>&1; then
   AT_CHECK([$OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i "R(UN)?PATH.*$DESTDIR"], [1])
   . $libdir/liba.la
   set x $library_names
diff --git a/tests/duplicate_conv.at b/tests/duplicate_conv.at
index 77496d0e..8b79a9e6 100644
--- a/tests/duplicate_conv.at
+++ b/tests/duplicate_conv.at
@@ -77,7 +77,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT
 LT_AT_EXEC_CHECK([./main],[0],[ignore],[ignore])
 $LIBTOOL --mode=clean rm -f libcee.la
 
-AT_CHECK([test "x$reload_cmds" = xfalse && exit 77], [1])
+AT_CHECK([test false = "$reload_cmds" && exit 77], [1])
 
 # Test whether this works with reloadable objects as well.
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la],
diff --git a/tests/fail.at b/tests/fail.at
index cec954b3..a4bf2264 100644
--- a/tests/fail.at
+++ b/tests/fail.at
@@ -102,8 +102,8 @@ case $build_libtool_libs in yes)
   $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c.c
   (
     . ./c.lo
-    test "$pic_object" != none && echo choke me >"$pic_object"
-    test "$non_pic_object" != none && 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/getopt-m4sh.at b/tests/getopt-m4sh.at
index 07287608..ee59ca51 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -48,7 +48,7 @@ m4_pattern_forbid([m4_include])
 m4_pattern_forbid([AS_INIT])
 AT_CHECK([$M4SH --version || exit 77], [], [ignore], [ignore])
 AT_CHECK([$M4SH -B $abs_top_srcdir/build-aux options.m4sh > t-options],
-	 [], [], [], [AT_CHECK([test "$at_status" -eq 63 && exit 77])])
+	 [], [], [], [AT_CHECK([test 63 -eq "$at_status" && exit 77])])
 $SED "s,@LN_S\@,$LN_S,g;s,@SED\@,$SED,g" t-options > options
 ])# _LT_AT_GETOPT_M4SH_SETUP
 
diff --git a/tests/help.at b/tests/help.at
index 0b60a0db..2585b58c 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -121,7 +121,7 @@ AT_CHECK([case "$LIBTOOL $CC $CPPFLAGS $CFLAGS $LDFLAGS " in ]dnl
 
 check_trace ()
 {
-  if test "X$trace" = X--debug; then
+  if test X--debug = "X$trace"; then
     AT_CHECK([grep 'enabling shell trace mode' stdout stderr], [0], [ignore])
     AT_CHECK([grep ' --mode' stderr], [0], [ignore])
   else
@@ -164,7 +164,7 @@ for trace in '' --debug; do
   AT_CHECK([$orig_LIBTOOL --mode=install $lt_INSTALL liba.la libb.la $libdir],
 	   [], [stdout], [stderr])
   if grep ': relinking ' stdout stderr; then
-    if test "X$trace" = X--debug; then
+    if test X--debug = "X$trace"; then
       AT_CHECK([grep ' --mode=relink' stdout stderr | grep ' --debug '],
 	       [0], [ignore])
     else
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 9c97fdb4..30362840 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -723,7 +723,7 @@ func_serial ()
     # in the file that AC_DEFUNs MACRO_REGEX.
     my_serial=
     if test -z "$my_macro_regex" ||
-       test "$my_filename" = aclocal.m4 ||
+       test aclocal.m4 = "$my_filename" ||
        test "$my_macro_regex" = `echo "$my_filename" | $SED "$basename"` ||
        func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_filename"
     then
diff --git a/tests/link-2.test b/tests/link-2.test
index 1418c01a..565bede8 100755
--- a/tests/link-2.test
+++ b/tests/link-2.test
@@ -38,7 +38,7 @@ res=$?
 
 rm -f hell.lo
 
-test "$res" -eq 0 || exit $EXIT_FAILURE
+test 0 -eq "$res" || exit $EXIT_FAILURE
 
 echo "$linkresult"
 case $linkresult in
diff --git a/tests/link-order2.at b/tests/link-order2.at
index 2f0096bb..298f6155 100644
--- a/tests/link-order2.at
+++ b/tests/link-order2.at
@@ -104,7 +104,7 @@ for type_of_depdepl in libtool non-libtool; do
     # Simulate a non-Libtool system library.
     rm $deflibdir/liba1.la
     addpath=$deflibdir
-    if test "$shlibpath_var" = PATH; then
+    if test PATH = "$shlibpath_var"; then
       addpath=$defbindir
     fi
     sep=
@@ -114,9 +114,9 @@ for type_of_depdepl in libtool non-libtool; do
   fi
   for static in '' -static-libtool-libs; do
     case `$LIBTOOL --features` in
-    *disable\ static\ libraries*) test "$static" = '' || continue;;
+    *disable\ static\ libraries*) test -z "$static" || continue;;
     esac
-    test "$type_of_depdepl,$static" = "non-libtool,-static-libtool-libs" &&
+    test non-libtool,-static-libtool-libs = "$type_of_depdepl,$static" &&
        static=-all-static
     $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath $libdir
     $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la -rpath $libdir
diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at
index bf5d04f8..fd17112a 100644
--- a/tests/lt_dlopenext.at
+++ b/tests/lt_dlopenext.at
@@ -222,7 +222,7 @@ else
   have=with
 fi
 
-if test "$shlibpath_var" = PATH; then
+if test PATH = "$shlibpath_var"; then
   $unset shlibpath_var || shlibpath_var=
 fi
 
diff --git a/tests/mdemo/configure.ac b/tests/mdemo/configure.ac
index ed9a152f..8476b5d5 100644
--- a/tests/mdemo/configure.ac
+++ b/tests/mdemo/configure.ac
@@ -55,7 +55,7 @@ LT_INIT([dlopen win32-dll])
 AC_SUBST(LIBTOOL_DEPS)
 
 STATIC=
-test "X$enable_static" = Xyes && STATIC="-static"
+test yes = "$enable_static" && STATIC="-static"
 AC_SUBST([STATIC])
 
 
diff --git a/tests/mdemo2/configure.ac b/tests/mdemo2/configure.ac
index 23ad6df3..b25e4555 100644
--- a/tests/mdemo2/configure.ac
+++ b/tests/mdemo2/configure.ac
@@ -51,7 +51,7 @@ LT_INIT([dlopen])
 AC_SUBST(LIBTOOL_DEPS)
 
 STATIC=
-test "X$enable_static" = Xyes && STATIC="-static"
+test yes = "$enable_static" && STATIC="-static"
 AC_SUBST([STATIC])
 
 
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index 2b162eb8..4eee3b90 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -158,7 +158,7 @@ LDFLAGS=$LDFLAGS
 eval "`$LIBTOOL --config | $EGREP '^(libname_spec)='`"
 name=
 eval libname=\"$libname_spec\"
-AT_CHECK([test "$libname" = lib || exit 77])
+AT_CHECK([test lib = "$libname" || exit 77])
 
 # Create our own libtool, forcing need_lib_prefix setting
 sed 's,^\(need_lib_prefix\)=.*$,\1=unknown,' $LIBTOOL > ./libtool
diff --git a/tests/nocase.at b/tests/nocase.at
index faacc0dd..5764249c 100644
--- a/tests/nocase.at
+++ b/tests/nocase.at
@@ -28,7 +28,7 @@ AT_KEYWORDS([libtool])
 
 eval `$LIBTOOL --config | $EGREP '^(want_nocaseglob|file_magic_glob)='`
 
-AT_CHECK([test "$want_nocaseglob" != yes && ]dnl
+AT_CHECK([test yes != "$want_nocaseglob" && ]dnl
          [test -z "$file_magic_glob" && exit 77],
 	  [1], [ignore], [ignore])
 
diff --git a/tests/pdemo/configure.ac b/tests/pdemo/configure.ac
index 740603a4..5fe89c7b 100644
--- a/tests/pdemo/configure.ac
+++ b/tests/pdemo/configure.ac
@@ -51,13 +51,13 @@ LT_INIT([dlopen])
 AC_SUBST([LIBTOOL_DEPS])
 
 STATIC=
-test "X$enable_static" = Xyes && STATIC=-static
+test yes = "$enable_static" && STATIC=-static
 AC_SUBST([STATIC])
 
 case $lt_cv_sys_global_symbol_pipe in
   ?*) binary_helldl=yes ;;
 esac
-AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
+AM_CONDITIONAL([BINARY_HELLDL], [test yes = "$binary_helldl"])
 
 
 ## ---------------------------- ##
diff --git a/tests/pic_flag.at b/tests/pic_flag.at
index 3f7388a7..f3ee29da 100644
--- a/tests/pic_flag.at
+++ b/tests/pic_flag.at
@@ -44,7 +44,7 @@ if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
   CXX_pic_flag=
 fi
 
-AT_CHECK([test "$at_srcdir" != . || exit 77])
+AT_CHECK([test . != "$at_srcdir" || exit 77])
 LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
 		[lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"],
 		["$abs_top_srcdir"/configure --disable-silent-rules])
diff --git a/tests/search-path.at b/tests/search-path.at
index 28df443a..8f322250 100644
--- a/tests/search-path.at
+++ b/tests/search-path.at
@@ -78,7 +78,7 @@ HCURSOR get_cursor (void)
 ]])
 
 eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
-AT_CHECK([test "$build_libtool_libs" = yes || exit 77])
+AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
 
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC \
 	  $CC $CPPFLAGS $CFLAGS -o gc.lo -c gc.c || exit 77],
diff --git a/tests/shlibpath.at b/tests/shlibpath.at
index eea059b9..38e66ee6 100644
--- a/tests/shlibpath.at
+++ b/tests/shlibpath.at
@@ -53,7 +53,7 @@ eval `$LIBTOOL --config | $EGREP '^(shlibpath_var|shlibpath_overrides_runpath)='
 # No point checking a system with static libraries:
 LT_AT_EXEC_CHECK([./m], [1], [ignore], [ignore], [|| exit 1 && exit 77])
 
-if test "$shlibpath_var" = PATH; then
+if test PATH = "$shlibpath_var"; then
   addpath=`pwd`/moved/bin
 else
   addpath=`pwd`/moved/lib
@@ -62,7 +62,7 @@ sep=
 eval test -n \"\$$shlibpath_var\" && sep=:
 eval $shlibpath_var='$addpath$sep$'$shlibpath_var
 export $shlibpath_var
-if test "$shlibpath_overrides_runpath" != no; then
+if test no != "$shlibpath_overrides_runpath"; then
   LT_AT_EXEC_CHECK([./m], [0], [ignore], [ignore])
 else
   LT_AT_EXEC_CHECK([./m], [1], [ignore], [ignore], [|| exit 1])
diff --git a/tests/static.at b/tests/static.at
index ef61b1e7..8c9b0187 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -130,7 +130,7 @@ func_fix_path ()
   # against a broken library but the good one would come later in the PATH.
   # So we let the caller of this function set the order: the "other" two
   # come first.
-  if test "$shlibpath_var" = PATH; then
+  if test PATH = "$shlibpath_var"; then
     save_PATH=$PATH
     sep=
     test -z "$PATH" || sep=:
@@ -141,7 +141,7 @@ func_fix_path ()
 
 func_restore_path ()
 {
-  if test "$shlibpath_var" = PATH; then
+  if test PATH = "$shlibpath_var"; then
     PATH=$save_PATH
   fi
 }
@@ -244,11 +244,11 @@ for withdep in no yes; do
   done
 
   ### install the libraries.
-  test "$withdep" = yes && $LIBTOOL --mode=install cp a1/liba1dep.la $libdir1/liba1dep.la
+  test yes = "$withdep" && $LIBTOOL --mode=install cp a1/liba1dep.la $libdir1/liba1dep.la
   $LIBTOOL --mode=install cp a1/liba1.la $libdir1/liba1.la
   $LIBTOOL --mode=install cp a3/liba3.la $libdir3/liba3.la
   $LIBTOOL --mode=clean rm -f a1/liba1.la a3/liba3.la
-  test "$withdep" = yes && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
+  test yes = "$withdep" && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
   # simulate a non-libtool lib:
   rm -f $libdir3/liba3.la
 
diff --git a/tests/sysroot.at b/tests/sysroot.at
index 524db5e9..34e6d48d 100644
--- a/tests/sysroot.at
+++ b/tests/sysroot.at
@@ -67,7 +67,7 @@ LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
 configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
 
 #???
-if test "$shlibpath_var" = PATH; then
+if test PATH = "$shlibpath_var"; then
   configure_options="$configure_options --libdir=/$prefix/bin"
 fi
 
diff --git a/tests/tagtrace.test b/tests/tagtrace.test
index 9b737e88..1d01ce50 100755
--- a/tests/tagtrace.test
+++ b/tests/tagtrace.test
@@ -35,10 +35,10 @@ fi
 
 ( cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
 ret=$?
-if test "$ret" -eq 63 || test "$ret" -eq 1; then
+if test 63 -eq "$ret" || test 1 -eq "$ret"; then
   func_error "This test requires the same Autoconf version"
   func_skip  "as the one that was used to bootstrap Libtool"
-elif test "$ret" -ne 0; then
+elif test 0 -ne "$ret"; then
   func_fatal_error "\`$AUTOCONF --trace' exited $ret"
 fi
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 84894e1e..48aa080a 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -30,7 +30,7 @@ m4_divert_push([PREPARE_TESTS])dnl
 : ${AUTOCONF=autoconf}
 : ${AUTOMAKE=automake}
 : ${AUTORECONF=autoreconf}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+test set = "${ECHO+set}" || ECHO=${as_echo-'printf %s\n'}
 : ${ECHO=$as_echo}
 for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do
   if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi
@@ -113,7 +113,7 @@ AT_CHECK([LT_AT_LIBTOOLIZE([$1])],
 # --------------------------
 m4_define([LT_AT_ACLOCAL],
 [AT_CHECK([$ACLOCAL $1], [0], [ignore], [ignore])
-AT_XFAIL_IF([test "$ACLOCAL" = no])
+AT_XFAIL_IF([test no = "$ACLOCAL"])
 AT_KEYWORDS([automake])
 ])
 
@@ -122,7 +122,7 @@ AT_KEYWORDS([automake])
 # --------------------------
 m4_define([LT_AT_AUTOCONF],
 [AT_CHECK([$AUTOCONF $1], [0], [ignore], [ignore])
-AT_XFAIL_IF([test "$AUTOCONF" = no])
+AT_XFAIL_IF([test no = "$AUTOCONF"])
 AT_KEYWORDS([autoconf])
 ])
 
@@ -132,7 +132,7 @@ AT_KEYWORDS([autoconf])
 m4_define([LT_AT_AUTOMAKE],
 [AT_CHECK([$AUTOMAKE $1], [0], [ignore], [stderr],
   [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
-AT_XFAIL_IF([test "$AUTOMAKE" = no])
+AT_XFAIL_IF([test no = "$AUTOMAKE"])
 AT_KEYWORDS([automake])
 ])
 
@@ -141,7 +141,7 @@ AT_KEYWORDS([automake])
 # ---------------------------
 m4_define([LT_AT_AUTOHEADER],
 [AT_CHECK([$AUTOHEADER $1], [0], [ignore], [ignore])
-AT_XFAIL_IF([test "$AUTOHEADER" = no])
+AT_XFAIL_IF([test no = "$AUTOHEADER"])
 AT_KEYWORDS([autoconf])
 ])
 
@@ -296,7 +296,7 @@ m4_define([LT_AT_TAG],
 AT_CHECK([{ test -n "[$]$1" && test "X[$]$1" != Xno; } || (exit 77)])
 m4_case([$1],
   [CXX],
-  [AT_CHECK([test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)])],
+  [AT_CHECK([test g++ != "$CXX" || (g++ -v >/dev/null 2>&1) || (exit 77)])],
   [GCJ],
   [# There are just too many broken gcj installations out there, either missing
    # libgcj.spec or unable to find it.  Skip the test for them.
diff --git a/tests/with-pic.at b/tests/with-pic.at
index c01e5d75..c50c5406 100644
--- a/tests/with-pic.at
+++ b/tests/with-pic.at
@@ -24,8 +24,8 @@
 AT_SETUP([test --with-pic])
 eval `$LIBTOOL --config | $EGREP '^(pic_flag|FGREP)='`
 
-AT_CHECK([test "z$pic_flag" != "z" || exit 77])
-AT_CHECK([test "$at_srcdir" != . || exit 77])
+AT_CHECK([test -n "$pic_flag" || exit 77])
+AT_CHECK([test . != "$at_srcdir" || exit 77])
 
 CONFIGURE=$abs_top_srcdir/tests/demo/configure
 : ${MAKE=make}