wecisecode il y a 5 jours
Parent
commit
feff7329bb
2 fichiers modifiés avec 10 ajouts et 1 suppressions
  1. 6 0
      odbctest/mql/mqltest.sh
  2. 4 1
      odbctest/mql/oktest.sh

+ 6 - 0
odbctest/mql/mqltest.sh

@@ -36,4 +36,10 @@ if [[ "${keyspace}" != "" ]]; then
 fi
 sleep 2
 
+mglproc=`ps -ef | grep -v grep | grep mql | grep "basic$"`
+if [[ "$mqlproc" != "" ]]; then
+    echo "mql test is running"
+    exit 111
+fi
 ./mql "$@" 2>&1 | tee ${logfile}
+exit $?

+ 4 - 1
odbctest/mql/oktest.sh

@@ -58,8 +58,11 @@ while [[ $n -lt 1000 ]]; do
     }
 
     run() {
-        ret=0
         ./mqltest.sh "$@"
+        ret=$?
+        if [[ "$ret" == "111" ]]; then
+            exit $ret
+        fi
         lastline=`tail -n 1 $logfile`
         if [[ "$lastline" != "PASS" ]]; then
             ret=1