make shell script more portable (FDO Bug #11667)

2008-01-15  John (J5) Palmieri  <johnp@redhat.com>

	* tests/name-test/run-test.sh: make more portable (FDO Bug #11667)

diff --git a/ChangeLog b/ChangeLog
index abc9be2..a8d5ab0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
 
+       * tests/name-test/run-test.sh: make more portable (FDO Bug #11667)
+
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+
        * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
 
        * dbus/dbus-connection.c (_dbus_connection_get_next_client_serial):

diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
index 0a1f711..5d9c584 100755 (executable)
--- a/test/name-test/run-test.sh
+++ b/test/name-test/run-test.sh
@@ -16,7 +16,8 @@ SCRIPTNAME=$0
 MODE=$1
 
 ## so the tests can complain if you fail to use the script to launch them
-export DBUS_TEST_NAME_RUN_TEST_SCRIPT=1
+DBUS_TEST_NAME_RUN_TEST_SCRIPT=1
+export DBUS_TEST_NAME_RUN_TEST_SCRIPT
 
 # Rerun ourselves with tmp session bus if we're not already
 if test -z "$DBUS_TEST_NAME_IN_RUN_TEST"; then
@@ -25,13 +26,13 @@ if test -z "$DBUS_TEST_NAME_IN_RUN_TEST"; then
   exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
 fi 
 echo "running test-ids"
-libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-ids || die "test-ids failed"
+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-ids || die "test-ids failed"
 
 echo "running test-names"
-libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || die "test-names failed"
+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || die "test-names failed"
 
 echo "running test-pending-call-dispatch"
-libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-pending-call-dispatch || die "test-pending-call-dispatch failed"
+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-pending-call-dispatch || die "test-pending-call-dispatch failed"
 
 echo "running test-threads-init"
-libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-threads-init || die "test-threads-init failed"
+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-threads-init || die "test-threads-init failed"