From 8052cbc6c2ced05f2176a14e2d39f00f82359159 Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Sun, 6 Jun 2010 14:21:14 +0200 Subject: regress-driver fixes These changes are necessary on my 32-bit Linux to make the tests work again after the GPSD_HOME addition. The fake.py changes is needed in case GPSD_HOME is not set at all (my initial problem); the 2nd hunk exports GPSD_HOME for subprocesses of regress-driver and uses it internally. --- regress-driver | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'regress-driver') diff --git a/regress-driver b/regress-driver index 6cc040cc..8fdd4d44 100755 --- a/regress-driver +++ b/regress-driver @@ -29,7 +29,7 @@ if [ -d ${py_libdir} ] && [ -d ${py_scriptdir} ]; then PATH=${py_scriptdir}:${PATH} fi -export PATH +export GPSD_HOME PATH mode=regress testing=daemon @@ -82,7 +82,7 @@ case $mode in then case $testing in daemon) gpsfake -s 38400 -1 -p $opts ${f} | ${GPSFILTER} ${ALTFILTER} >${TMP}/test-$$.chk ;; - clientlib) libgps -b <${f} >${TMP}/test-$$.chk ;; + clientlib) $GPSD_HOME/libgps -b <${f} >${TMP}/test-$$.chk ;; esac sed -n <${f}.chk >${TMP}/log-copy-$$.chk ${ALTFILTER} -e 'p'; sed -n <${TMP}/test-$$.chk >${TMP}/test-whole-$$.chk ${ALTFILTER} -e 'p'; @@ -122,7 +122,7 @@ case $mode in for f in $*; do case $testing in daemon) gpsfake -s 38400 -1 -p $opts ${f} | ${GPSFILTER} >${f}.chk;; - clientlib) libgps -b <${f} >${f}.chk ;; + clientlib) $GPSD_HOME/libgps -b <${f} >${f}.chk ;; esac done status=0 @@ -132,7 +132,7 @@ case $mode in for f in $*; do case $testing in daemon) gpsfake -s 38400 -1 -p $opts ${f} | ${GPSFILTER} ;; - clientlib) libgps -b <${f} ;; + clientlib) $GPSD_HOME/libgps -b <${f} ;; esac done status=0 -- cgit v1.2.1