From d9707b0f30d49fc9bb98d5ce10da8842dcd6d275 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 24 Sep 2003 11:45:44 +0000
Subject: [PATCH] Reduce output for tests

---
 configure.in          |    7 +------
 test/config/test1.sh  |    5 +++--
 test/config/test2.sh  |    7 ++++---
 test/gils/Makefile.am |   12 ++----------
 test/gils/stop03.sh   |    8 ++++++--
 test/malxml/test1.sh  |    5 +++--
 test/sort/test1.sh    |    3 +--
 test/zsh/testall.sh   |    1 -
 8 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/configure.in b/configure.in
index 8dc9334..c304b47 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2003
-dnl $Id: configure.in,v 1.83 2003-09-16 12:18:24 adam Exp $
+dnl $Id: configure.in,v 1.84 2003-09-24 11:45:44 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AM_INIT_AUTOMAKE(idzebra,1.3.12)
@@ -76,11 +76,6 @@ else
 	yazflag=""
 fi
 YAZ_INIT($yazflag)
-if echo "$YAZINC"|grep YAZ_POSIX_THREADS=1 >/dev/null; then
-	AM_CONDITIONAL(ISTHR,true)
-else
-	AM_CONDITIONAL(ISTHR,false)
-fi	
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
 dnl see if tclConfig.sh exists in same prefix lcoation as tclsh; otherwise
diff --git a/test/config/test1.sh b/test/config/test1.sh
index 92f67d9..8a1b546 100755
--- a/test/config/test1.sh
+++ b/test/config/test1.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-../../index/zebraidx init
-../../index/zebraidx update g.rec
+LOG=test1.log
+../../index/zebraidx -l $LOG init
+../../index/zebraidx -l $LOG update g.rec
diff --git a/test/config/test2.sh b/test/config/test2.sh
index 3357251..0557c8e 100755
--- a/test/config/test2.sh
+++ b/test/config/test2.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-if ../../index/zebraidx -V|grep Tcl >/dev/null; then
-	../../index/zebraidx init
-	../../index/zebraidx -s -t grs.tcl.m update m.rec | grep tag:dc:subject >/dev/null
+LOG=test2.log
+if ../../index/zebraidx -l $LOG -V|grep Tcl >/dev/null; then
+	../../index/zebraidx -l $LOG init
+	../../index/zebraidx -l $LOG -s -t grs.tcl.m update m.rec | grep tag:dc:subject >/dev/null
 else
 	exit 0
 fi
diff --git a/test/gils/Makefile.am b/test/gils/Makefile.am
index 296e2ce..dae785c 100644
--- a/test/gils/Makefile.am
+++ b/test/gils/Makefile.am
@@ -1,20 +1,12 @@
-# $Id: Makefile.am,v 1.15 2003-05-21 14:39:22 adam Exp $
+# $Id: Makefile.am,v 1.16 2003-09-24 11:45:44 adam Exp $
 
 dist-hook:
 	-mkdir $(distdir)/records
 	cp $(srcdir)/records/*.grs $(distdir)/records
 
-# stop03.sh only works when Zebra is using threads.
-if ISTHR
-testscripts_thread = stop03.sh
-else
-testscripts_thread = 
-endif
-
 check_SCRIPTS = stop01.sh stop02.sh stop03.sh stop04.sh \
         test1.sh test2.sh timing1.sh timing2.sh
 
-TESTS = stop01.sh stop02.sh $(testscripts_thread) stop04.sh \
-        test1.sh test2.sh timing1.sh timing2.sh
+TESTS = $(check_SCRIPTS)
 
 EXTRA_DIST = zebra1.cfg zebra2.cfg $(check_SCRIPTS)
diff --git a/test/gils/stop03.sh b/test/gils/stop03.sh
index a057327..f28a7b0 100755
--- a/test/gils/stop03.sh
+++ b/test/gils/stop03.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: stop03.sh,v 1.5 2003-05-24 22:34:48 adam Exp $
+# $Id: stop03.sh,v 1.6 2003-09-24 11:45:44 adam Exp $
 # test start and stop of the threaded server (-T)
 
 LOG=stop03.log
@@ -17,11 +17,15 @@ test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
 
 echo "Starting server with -T (threaded)..." >>$LOG
 (
-  ../../index/zebrasrv -T -c zebra1.cfg -l $LOG tcp:@:9901 ||
+  ../../index/zebrasrv -T -c zebra1.cfg -l $LOG tcp:@:9901 2>out ||
     echo "server failed with $?" > $LOG
 )&
 sleep 1
 
+if grep 'not available' out >/dev/null; then
+    test -f zebrasrv.pid && rm zebrasrv.pid
+    exit 0
+fi
 echo "  checking that it runs... " >>$LOG
 test -f zebrasrv.pid || exit 1
 PID=`cat zebrasrv.pid`
diff --git a/test/malxml/test1.sh b/test/malxml/test1.sh
index eb12cd1..b2bdbd8 100755
--- a/test/malxml/test1.sh
+++ b/test/malxml/test1.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-../../index/zebraidx init
-../../index/zebraidx update f1.xml
+LOG=test1.log
+../../index/zebraidx -l $LOG init
+../../index/zebraidx -l $LOG update f1.xml
diff --git a/test/sort/test1.sh b/test/sort/test1.sh
index 091de73..2d18e7c 100755
--- a/test/sort/test1.sh
+++ b/test/sort/test1.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-# $Id: test1.sh,v 1.4 2003-09-05 12:33:39 adam Exp $
+# $Id: test1.sh,v 1.5 2003-09-24 11:45:44 adam Exp $
 ulimit -c 10000
-set -x
 LOG=test1.log
 rm -fr lock
 mkdir lock
diff --git a/test/zsh/testall.sh b/test/zsh/testall.sh
index d5670d6..b2fa5cf 100755
--- a/test/zsh/testall.sh
+++ b/test/zsh/testall.sh
@@ -19,5 +19,4 @@ then
     echo "Tests FAILED"
     exit 9
 fi
-echo OK
 exit 0
-- 
1.7.10.4