tests: misc: cleanup shell usage

Add quotes for most usages of variables.

Added ${} for variables.

Cleanup indentation to be consistent with other tests.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

2 files changed, 33 insertions, 37 deletions

diff --git a/tests/slow/override-ciphers b/tests/slow/override-ciphers
index 45cc8623f2..aa1e7ad21d 100755
--- a/tests/slow/override-ciphers
+++ b/tests/slow/override-ciphers
@@ -20,41 +20,39 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-srcdir="${srcdir:-.}"
-CLI="${CLI:-../../src/gnutls-cli$EXEEXT}"
 unset RETCODE
 if ! test -z "${VALGRIND}";then
-VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
+  VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
-GNUTLS_NO_EXPLICIT_INIT=1 $VALGRIND ./cipher-override
+GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ./cipher-override
 if test $? != 0;then
-	echo "overriden cipher tests failed"
-	exit 1
+  echo "overriden cipher tests failed"
+  exit 1
 fi
 
-$VALGRIND ./cipher-override
+${VALGRIND} ./cipher-override
 if test $? != 0;then
-	echo "overriden cipher tests 2 failed"
-	exit 1
+  echo "overriden cipher tests 2 failed"
+  exit 1
 fi
 
-$VALGRIND ./cipher-override2
+${VALGRIND} ./cipher-override2
 if test $? != 0;then
-	echo "overriden cipher tests 3 failed"
-	exit 1
+  echo "overriden cipher tests 3 failed"
+  exit 1
 fi
 
-GNUTLS_NO_EXPLICIT_INIT=1 $VALGRIND ./mac-override
+GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ./mac-override
 if test $? != 0;then
-	echo "overriden mac tests failed"
-	exit 1
+  echo "overriden mac tests failed"
+  exit 1
 fi
 
-$VALGRIND ./mac-override
+${VALGRIND} ./mac-override
 if test $? != 0;then
-	echo "overriden mac tests 2 failed"
-	exit 1
+  echo "overriden mac tests 2 failed"
+  exit 1
 fi
 
 exit 0
diff --git a/tests/slow/test-ciphers b/tests/slow/test-ciphers
index 7d66d54f3b..0b66bb1f6f 100755
--- a/tests/slow/test-ciphers
+++ b/tests/slow/test-ciphers
@@ -20,59 +20,57 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-srcdir="${srcdir:-.}"
-CLI="${CLI:-../../src/gnutls-cli$EXEEXT}"
 unset RETCODE
 if ! test -z "${VALGRIND}";then
-VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
+  VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
 ./cipher-test
 if test $? != 0;then
-	echo "default cipher tests failed"
-	exit 1
+  echo "default cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x1 ./cipher-test
 if test $? != 0;then
-	echo "included cipher tests failed"
-	exit 1
+  echo "included cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x2 ./cipher-test
 if test $? != 0;then
-	echo "AESNI cipher tests failed"
-	exit 1
+  echo "AESNI cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x4 ./cipher-test
 if test $? != 0;then
-	echo "SSSE3 cipher tests failed"
-	exit 1
+  echo "SSSE3 cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x8 ./cipher-test
 if test $? != 0;then
-	echo "PCLMUL cipher tests failed"
-	exit 1
+  echo "PCLMUL cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x100000 ./cipher-test
 if test $? != 0;then
-	echo "padlock cipher tests failed"
-	exit 1
+  echo "padlock cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x200000 ./cipher-test
 if test $? != 0;then
-	echo "padlock PHE cipher tests failed"
-	exit 1
+  echo "padlock PHE cipher tests failed"
+  exit 1
 fi
 
 GNUTLS_CPUID_OVERRIDE=0x400000 ./cipher-test
 if test $? != 0;then
-	echo "padlock PHE SHA512 cipher tests failed"
-	exit 1
+  echo "padlock PHE SHA512 cipher tests failed"
+  exit 1
 fi
 
 exit 0