Bugfixes in music_tests

configure.ac

@@ -294,17 +294,42 @@ else
   MUSIC_HAVE_MPI_COMM_CREATE_ERRHANDLER=0
 fi
 
-if test "$prefix" = NONE; then
-   PKGDATADIR=`eval echo $ac_default_prefix/share/$PACKAGE-$PACKAGE_VERSION`
+# Pre-evaluating some autoconf variables
+if test "x$prefix" = xNONE; then
+  PREFIX=$ac_default_prefix
+  prefix=$PREFIX
 else
-   PKGDATADIR=`eval echo $prefix/share/$PACKAGE-$PACKAGE_VERSION`
+  PREFIX="$prefix"
 fi
-
-if test "$prefix" = NONE; then
-   PKGEXTRABINDIR=`eval echo $ac_default_prefix/lib/$PACKAGE-$PACKAGE_VERSION`
+if test "x$exec_prefix" = xNONE; then
+  EXEC_PREFIX="$PREFIX"
+  exec_prefix=$EXEC_PREFIX
+else
+  EXEC_PREFIX="`eval echo $exec_prefix`"
+fi
+if test "x$bindir" = 'x${exec_prefix}/bin'; then
+  BINDIR="$EXEC_PREFIX/bin"
+else
+  BINDIR="`eval echo $bindir`"
+fi
+if test "x$libdir" = 'x${exec_prefix}/lib'; then
+  LIBDIR="$EXEC_PREFIX/lib"
 else
-   PKGEXTRABINDIR=`eval echo $prefix/lib/$PACKAGE-$PACKAGE_VERSION`
+  LIBDIR="`eval echo $libdir`"
 fi
+if test "x$datarootdir" = 'x${prefix}/share'; then
+  DATAROOTDIR="$PREFIX/share"
+else
+  DATAROOTDIR="`eval echo $datarootdir`"
+fi
+if test "x$datadir" = 'x${datarootdir}'; then
+  DATADIR="$DATAROOTDIR"
+else
+  DATADIR="`eval echo $datadir`"
+fi
+
+PKGDATADIR="$DATADIR/$PACKAGE-$PACKAGE_VERSION"
+PKGEXTRABINDIR="$LIBDIR/$PACKAGE-$PACKAGE_VERSION"
 
 #TEST_SH_LIST=${srcdir}/*.test
 
@@ -393,6 +418,7 @@ AC_SUBST(OPTIONAL_UTILS)
 AC_SUBST(TESTDIR)
 AC_SUBST(EXAMPLESDIR)
 AC_SUBST(EXTRAS)
+AC_SUBST(BINDIR)
 AC_SUBST(PKGDATADIR)
 AC_SUBST(PKGEXTRABINDIR)
 AC_SUBST(LAUNCHSTYLE)

testsuite/music_tests.in

 #!/bin/sh
 #
-# This script runs all tests that are located in the testsuite directory
+# This script runs all tests that are located in the MUSIC testsuite directory
 #
 
 usage ()
@@ -10,7 +10,7 @@ usage ()
     fi
     
     cat <<EOF
-Usage: music_tests.sh [options ...]
+Usage: music_tests [options ...]
 
 Options:
 
@@ -169,14 +169,14 @@ run_test()
     echo "#!/bin/sh" > "${TEST_RUNFILE}"
     echo "set +e" >> "${TEST_RUNFILE}"
     
-    command="'${TEST_BASEDIR}/${test_name}' > '${TEST_OUTFILE}' 2>&1"
+    command="${TEST_BASEDIR}/${test_name} > ${TEST_OUTFILE} 2>&1"
 
     echo "${command}" >> "${TEST_RUNFILE}"
-    echo "echo \$? > '${TEST_RETFILE}' ; exit 0" >> "${TEST_RUNFILE}"
+    echo "echo \$? > ${TEST_RETFILE} ; exit 0" >> "${TEST_RUNFILE}"
 
     chmod 755 "${TEST_RUNFILE}"
     
-    time_dirty="$( /bin/sh -c "time ${TIME_PARAM} '${TEST_RUNFILE}' " 2>&1 )"
+    time_dirty="$( /bin/bash -c "time ${TIME_PARAM} ${TEST_RUNFILE} " 2>&1 )"
     rm -f "${TEST_RUNFILE}"
 
     TIME_ELAPSED="$( echo "${time_dirty}" | awk 'NR == 1 { print $2 ; }' )"
@@ -313,7 +313,7 @@ done
 TEST_BASEDIR="@PKGDATADIR@/tests"
 echo >> "${TEST_LOGFILE}" "Running tests from ${TEST_BASEDIR}" 
 
-TEST_BINDIR="@prefix@/@bindir@"
+TEST_BINDIR="@BINDIR@"
 export TEST_BINDIR
 
 TEST_EXTRABINDIR="@PKGEXTRABINDIR@"
@@ -322,7 +322,7 @@ export TEST_EXTRABINDIR
 CMP="${CMP-cmp}"
 export CMP
 
-MUSIC_BINARY="@prefix@/@bindir@/MUSIC"
+MUSIC_BINARY="@BINDIR@/musicrun"
 export MUSIC_BINARY