shell

odbctest/mql/mqltest.sh

@@ -7,7 +7,7 @@ if [[ "$0" =~ / ]]; then cd "${0%/*}"; fi
 
 export CWD=`pwd`
 
-if [[ -e "~/odbserver/mql" ]]; then
+if [[ -e ~/odbserver/mql ]]; then
     mqlver=`ls -l mql`
     newmqlver=`cd ~/odbserver/; ls -l mql; cd ${CWD}`
     if [[ "$mqlver" != "$newmqlver" ]]; then
@@ -15,7 +15,7 @@ if [[ -e "~/odbserver/mql" ]]; then
     fi
 fi
 
-if [[ ! -e "mql.conf" ]]; then
+if [[ ! -e mql.conf ]]; then
     if [[ "${ODBPATH}" = "" ]]; then
         export ODBPATH=127.0.0.1:11001
     fi

odbctest/mql/oktest.sh

@@ -11,30 +11,35 @@ parseargs() {
 }
 parseargs "$@"
 
-last_odbserver=`/opt/matrix/odbserver/odbserver -version`
+if [[ -e /opt/matrix/odbserver/odbserver ]]; then
+    last_odbserver=`/opt/matrix/odbserver/odbserver -version`
+fi
 keyspace=`./mql keyspace? log.level=error "$@"`
 logfile="${keyspace}.test.log"
 
 n=0
 while [[ $n -lt 1000 ]]; do
     n=`expr $n + 1`
-    odbserver=`~/odbserver/odbserver -version`
-    if [[ "$odbserver" != "$last_odbserver" ]]; then
-        echo "odbserver changed" >> changed.log
-        echo "$last_odbserver" >> changed.log
-        echo "$odbserver" >> changed.log
-        ./sync.sh
-        last_odbserver="$odbserver"
+    if [[ -e ~/odbserver/odbserver ]]; then
+        odbserver=`~/odbserver/odbserver -version`
+        if [[ "$odbserver" != "$last_odbserver" ]]; then
+            echo "odbserver changed" >> changed.log
+            echo "$last_odbserver" >> changed.log
+            echo "$odbserver" >> changed.log
+            ./sync.sh
+            cp -pf ~/odbserver/odbserver /opt/matrix/odbserver/odbserver
+            last_odbserver="$odbserver"
 
-        if [[ "noinit" != "1" ]]; then
-            ./initkeyspace.sh $keyspace
-            ret=$?
-            if [[ "$ret" != "0" ]]; then
-                exit $ret
+            if [[ "noinit" != "1" ]]; then
+                ./initkeyspace.sh $keyspace
+                ret=$?
+                if [[ "$ret" != "0" ]]; then
+                    exit $ret
+                fi
             fi
-        fi
 
-        n=1
+            n=1
+        fi
     fi
 
     cd /opt/matrix/test
@@ -48,10 +53,12 @@ while [[ $n -lt 1000 ]]; do
             if [[ "$mqlproc" == "" ]]; then
                 exit 0
             fi
-            odbserver=`~/odbserver/odbserver -version`
-            if [[ "$odbserver" != "$last_odbserver" ]]; then
-                ps -ef | grep -v grep | grep mql | grep "log.prefix=${PREFIX}" | awk '{print $2}' | xargs kill -9
-                exit 0
+            if [[ -e ~/odbserver/odbserver ]]; then
+                odbserver=`~/odbserver/odbserver -version`
+                if [[ "$odbserver" != "$last_odbserver" ]]; then
+                    ps -ef | grep -v grep | grep mql | grep "log.prefix=${PREFIX}" | awk '{print $2}' | xargs kill -9
+                    exit 0
+                fi
             fi
             sleep 10
         done
@@ -63,7 +70,7 @@ while [[ $n -lt 1000 ]]; do
         if [[ "$ret" != "0" ]]; then
             exit $ret
         fi
-        lastline=`tail -n 1 $logfile`
+        lastline=`tail -n 1 $logfile 2>&1`
         if [[ "$lastline" != "PASS" ]]; then
             ret=1
             if [[ `echo "$lastline" | grep './mqltest.sh:' | grep "已杀死"` != "" ]]; then