Fix check for yaz-ztest. Fixed make distcheck.

diff --git a/test/Makefile.am b/test/Makefile.am
index abf372a..663302f 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2007-05-15 15:50:48 adam Exp $
+# $Id: Makefile.am,v 1.2 2007-05-15 21:40:57 adam Exp $
 
 check_SCRIPTS = test_http.sh
 
@@ -8,8 +8,8 @@ TESTS = $(check_SCRIPTS)
 
 MAINTAINERCLEANFILES = Makefile.in
 
-CONFIG_CLEAN_FILES=*.log
+CONFIG_CLEAN_FILES=*.log *.dif
 
 dist-hook:
-       cp test_http_*.res $(distdir)
+       cp ${srcdir}/test_http_*.res $(distdir)
 

diff --git a/test/test_http.sh b/test/test_http.sh
index 07363bb..2c62d4b 100755 (executable)
--- a/test/test_http.sh
+++ b/test/test_http.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: test_http.sh,v 1.2 2007-05-15 21:28:36 adam Exp $
+# $Id: test_http.sh,v 1.3 2007-05-15 21:40:57 adam Exp $
 #
 # Regression test using pazpar2 against yaz-ztest
 # Reads Pazpar2 URLs from test_http_urls
@@ -13,13 +13,13 @@ srcdir=${srcdir:-"."}
 
 # Find a suitable yaz-ztest
 yt=""
-for d in /usr/bin /usr/local/bin ../../yaz/ztest; do
+for d in /usr/bin /usr/local/bin ${srcdir}/../../yaz/ztest ${srcdir}/../../../yaz/ztest; do
     yt=${d}/yaz-ztest
     if test -x ${yt}; then
        break
     fi
 done
-if test -z "${yt}"; then
+if test ! -x "${yt}"; then
     echo "No yaz-ztest found. Skipping"
     exit 0
 fi
@@ -59,8 +59,8 @@ fi
 testno=1
 for f in `cat ${srcdir}/test_http_urls`; do
     OUT1=${srcdir}/test_http_${testno}.res
-    OUT2=${srcdir}/test_http_${testno}.log
-    DIFF=${srcdir}/test_http_${testno}.dif
+    OUT2=test_http_${testno}.log
+    DIFF=test_http_${testno}.dif
     if test -f $OUT1; then
        rm -f $OUT2
        wget -q -O $OUT2 $f