projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
331a52c
)
Wait more for zebrasrv to start (due to slow systems)
author
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 24 Sep 2004 15:03:19 +0000
(15:03 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 24 Sep 2004 15:03:19 +0000
(15:03 +0000)
test/gils/stop01.sh
patch
|
blob
|
history
test/gils/stop02.sh
patch
|
blob
|
history
test/gils/stop03.sh
patch
|
blob
|
history
test/gils/stop04.sh
patch
|
blob
|
history
test/gils/test1.sh
patch
|
blob
|
history
test/gils/test2.sh
patch
|
blob
|
history
diff --git
a/test/gils/stop01.sh
b/test/gils/stop01.sh
index
3bd6238
..
c91e76a
100755
(executable)
--- a/
test/gils/stop01.sh
+++ b/
test/gils/stop01.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop01.sh,v 1.6 2004-06-14 23:45:11 adam Exp $
+# $Id: stop01.sh,v 1.7 2004-09-24 15:03:19 adam Exp $
# test start and stop of the server with -1
pp=${srcdir:-"."}
# test start and stop of the server with -1
pp=${srcdir:-"."}
@@
-20,9
+20,8
@@
test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
echo "Starting server with -1 (one shot)..." >>$LOG
../../index/zebrasrv -1 -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
sleep 1
echo "Starting server with -1 (one shot)..." >>$LOG
../../index/zebrasrv -1 -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
sleep 1
-
echo " checking that it runs... " >>$LOG
echo " checking that it runs... " >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID |grep $PID >/dev/null || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID |grep $PID >/dev/null || exit 1
diff --git
a/test/gils/stop02.sh
b/test/gils/stop02.sh
index
d6216bf
..
428bf2c
100755
(executable)
--- a/
test/gils/stop02.sh
+++ b/
test/gils/stop02.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop02.sh,v 1.6 2004-06-14 23:45:11 adam Exp $
+# $Id: stop02.sh,v 1.7 2004-09-24 15:03:19 adam Exp $
# test start and stop of the server with -S
pp=${srcdir:-"."}
# test start and stop of the server with -S
pp=${srcdir:-"."}
@@
-22,7
+22,7
@@
echo "Starting server with -S (static)..." >>$LOG
sleep 1
echo " checking that it runs... " >>$LOG
sleep 1
echo " checking that it runs... " >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID |grep $PID >/dev/null || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID |grep $PID >/dev/null || exit 1
diff --git
a/test/gils/stop03.sh
b/test/gils/stop03.sh
index
7afed30
..
e2ab9fc
100755
(executable)
--- a/
test/gils/stop03.sh
+++ b/
test/gils/stop03.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop03.sh,v 1.7 2004-06-15 08:06:34 adam Exp $
+# $Id: stop03.sh,v 1.8 2004-09-24 15:03:19 adam Exp $
# test start and stop of the threaded server (-T)
pp=${srcdir:-"."}
# test start and stop of the threaded server (-T)
pp=${srcdir:-"."}
@@
-29,7
+29,7
@@
if grep 'not available' out >/dev/null; then
exit 0
fi
echo " checking that it runs... " >>$LOG
exit 0
fi
echo " checking that it runs... " >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID | grep $PID >/dev/null || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID | grep $PID >/dev/null || exit 1
diff --git
a/test/gils/stop04.sh
b/test/gils/stop04.sh
index
10bde11
..
11bfd7b
100755
(executable)
--- a/
test/gils/stop04.sh
+++ b/
test/gils/stop04.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop04.sh,v 1.6 2004-06-15 08:06:34 adam Exp $
+# $Id: stop04.sh,v 1.7 2004-09-24 15:03:19 adam Exp $
# test start and stop of the forked server
pp=${srcdir:-"."}
# test start and stop of the forked server
pp=${srcdir:-"."}
@@
-22,7
+22,7
@@
echo "Starting server with (forked)..." >>$LOG
sleep 1
echo " checking that it runs... " >>$LOG
sleep 1
echo " checking that it runs... " >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID | grep $PID >/dev/null || exit 1
PID=`cat zebrasrv.pid`
ps -p $PID | grep $PID >/dev/null || exit 1
diff --git
a/test/gils/test1.sh
b/test/gils/test1.sh
index
e3b526d
..
682ed78
100755
(executable)
--- a/
test/gils/test1.sh
+++ b/
test/gils/test1.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: test1.sh,v 1.9 2004-06-15 09:43:30 adam Exp $
+# $Id: test1.sh,v 1.10 2004-09-24 15:03:19 adam Exp $
pp=${srcdir:-"."}
pp=${srcdir:-"."}
@@
-22,7
+22,7
@@
echo "starting server..." >>$LOG
sleep 1
echo "checking it runs..." >>$LOG
sleep 1
echo "checking it runs..." >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
echo "search 1..." >>$LOG
../api/testclient localhost:9901 utah > log || exit 1
echo "search 1..." >>$LOG
../api/testclient localhost:9901 utah > log || exit 1
diff --git
a/test/gils/test2.sh
b/test/gils/test2.sh
index
233a221
..
c99e171
100755
(executable)
--- a/
test/gils/test2.sh
+++ b/
test/gils/test2.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: test2.sh,v 1.9 2004-06-15 09:43:30 adam Exp $
+# $Id: test2.sh,v 1.10 2004-09-24 15:03:19 adam Exp $
pp=${srcdir:-"."}
pp=${srcdir:-"."}
@@
-22,7
+22,7
@@
test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
echo "starting server..." >>$LOG
../../index/zebrasrv -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901 &
sleep 1
echo "starting server..." >>$LOG
../../index/zebrasrv -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901 &
sleep 1
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
echo "search 1..." >>$LOG
../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
echo "search 1..." >>$LOG
../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1