Kaynağa Gözat

testing files

wecisecode 2 gün önce
ebeveyn
işleme
87e457918f
2 değiştirilmiş dosya ile 11 ekleme ve 1 silme
  1. 5 1
      odbctest/mql/oktest.sh
  2. 6 0
      odbctest/odbcmql/mql_run.go

+ 5 - 1
odbctest/mql/oktest.sh

@@ -19,7 +19,11 @@ 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"
+if [[ `echo "${keyspace}" | wc -w` == "1" ]]; then
+    logfile="${keyspace}.test.log"
+else
+    logfile="test.log"
+fi
 
 wait_odbserver_change() {
     while true; do

+ 6 - 0
odbctest/odbcmql/mql_run.go

@@ -106,6 +106,9 @@ func Run(t *testing.T) {
 				if strings.Contains(ap, "=") {
 					continue
 				}
+				if ap == "files?" {
+					continue
+				}
 				if (ap == "-" || ap == "--") && i+1 < len(os.Args) {
 					s := strings.Join(os.Args[i+1:], " ")
 					spath = []string{"/tmp/1.mql"}
@@ -117,6 +120,9 @@ func Run(t *testing.T) {
 		}
 	}
 	if len(spath) == 0 || len(spath) == 1 && len(spath[0]) == 0 {
+		if mcfg.CommandArgs.GetString("files?") == "files?" {
+			os.Exit(0)
+		}
 		fmt.Print(`循环遍历执行指定路径下的 mql 文件
 usage: mql path [options] -- mqlstatement
   path                指定mql文件所在路径,通配符 ** 表示任意字符,* 表示除分隔符以外的任意字符, . 表示递归当前目录下的所有子目录