From f3a3de59530fcb8288cab54013df11d6016def62 Mon Sep 17 00:00:00 2001 From: Aaron Chen <462826@qq.com> Date: Tue, 6 Aug 2019 16:37:03 +0800 Subject: [PATCH] test and fix on win7 --- src/action/run.go | 5 +++-- src/utils/utils.go | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/action/run.go b/src/action/run.go index a2653a27..069c290e 100644 --- a/src/action/run.go +++ b/src/action/run.go @@ -17,7 +17,8 @@ func Run(scriptDir string, fileNames []string, langType string) { LangMap := script.LangMap var files []string - if fileNames != nil && len(fileNames) > 0 { + + if fileNames != nil && len(fileNames) > 0 { // pass a list if len(fileNames) == 1 { if strings.Index(fileNames[0], ".suite") > -1 { utils.RunMode = misc.SUITE @@ -31,7 +32,7 @@ func Run(scriptDir string, fileNames []string, langType string) { } files, _ = utils.GetSpecifiedFiles(scriptDir, fileNames) - } else { + } else { // give a dir files, _ = utils.GetAllFiles(scriptDir, LangMap[langType]["extName"]) utils.RunMode = misc.DIR utils.RunDir = utils.PathToRunName(scriptDir) diff --git a/src/utils/utils.go b/src/utils/utils.go index 29efe4e5..ae545e08 100644 --- a/src/utils/utils.go +++ b/src/utils/utils.go @@ -2,6 +2,7 @@ package utils import ( "github.com/easysoft/zentaoatf/src/misc" + "log" "os" "path" "regexp" @@ -48,6 +49,7 @@ func PathToRunName(filePath string) string { name := path.Base(filePath) ext := path.Ext(filePath) name = strings.Replace(name, ext, "", -1) + log.Panic(name) runName := RunMode.String() + "-" + name + "-" + DateTimeStrFmt(time.Now(), "2006-01-02 15:04:05") + string(os.PathSeparator) -- GitLab