comparison tests/test-utils.sh @ 198:e21cc48ddf4d

Make using AUDIODB='valgrind ../../audioDB' work without complaints.

 
 set -E
 
 trap "exit 1" ERR
 
-if [ -z ${AUDIODB} ]; then
+if [ -z "${AUDIODB}" ]; then
   AUDIODB=../../audioDB
 fi
 
 # FIXME: maybe generalize to multiple arguments?  Also, implement it
 # properly, rather than just for a few floats that we know how to

   sleep 1
   trap 'kill $!; exit 1' ERR
 }
 
 stop_server() {
-  grep ${AUDIODB} /proc/$1/cmdline > /dev/null
+  grep "${AUDIODB}" /proc/$1/cmdline > /dev/null
   kill $1
   # HACK: deal with race on process exit
   sleep 1
   expect_clean_error_exit grep ${AUDIODB} /proc/$1/cmdline
 }
 
 check_server() {
-  grep ${AUDIODB} /proc/$1/cmdline > /dev/null
+  grep "${AUDIODB}" /proc/$1/cmdline > /dev/null
 }
 
 expect_client_failure() {
   # FIXME: work out whether and how the client should report server
   # errors.  At present, the client exits with a zero exit code.