shell

odbctest/mql/mqltest.sh

@@ -7,6 +7,14 @@ if [[ "$0" =~ / ]]; then cd "${0%/*}"; fi
 
 export CWD=`pwd`
 
+if [[ -e "~/odbserver/mql" ]]; then
+    mqlver=`ls -l mql`
+    newmqlver=`cd ~/odbserver/; ls -l mql; cd ${CWD}`
+    if [[ "$mqlver" != "$newmqlver" ]]; then
+        cp -pf ~/odbserver/mql mql
+    fi
+fi
+
 if [[ ! -e "mql.conf" ]]; then
     if [[ "${ODBPATH}" = "" ]]; then
         export ODBPATH=127.0.0.1:11001
@@ -26,10 +34,6 @@ else
     lastlogfile="last.log"
 fi
 
-if [[ -e ${logfile} ]]; then
-    mv -f ${logfile} ${lastlogfile}
-fi
-
 if [[ "${odbpath}" != "" ]]; then
     echo ODBPATH="${odbpath}"
 fi
@@ -53,5 +57,9 @@ if [[ "$mqlproc" != "" ]]; then
     echo "another mql test is running"
     exit 111
 fi
+
+if [[ -e ${logfile} ]]; then
+    mv -f ${logfile} ${lastlogfile}
+fi
 ./mql "$@" 2>&1 | tee ${logfile}
 exit $?

odbctest/mql/oktest.sh

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

odbctest/mql/syncmql.sh

@@ -1,4 +1,4 @@
 
 installpath=`go env GOPATH | awk -F ':' '{print $1}'`/bin
 
-rsync -avz --delete --exclude=mql* --exclude=*.go --exclude=*.bat --exclude=*.sh --exclude=*.log --exclude=*. . ${installpath}/matrix/mql
+rsync -avz --delete --exclude=msh --exclude=mql* --exclude=*.go --exclude=*.bat --exclude=*.sh --exclude=*.log --exclude=*. . ${installpath}/matrix/mql