test on win7

src/biz/exe.go

@@ -7,14 +7,14 @@ import (
 	"time"
 )
 
-func ExeScripts(files []string, dir string, langType string, report *model.TestReport) {
+func ExeScripts(files []string, scriptDir string, langType string, report *model.TestReport) {
 	utils.PrintWholeLine(utils.I118Prt.Sprintf("start_execution", ""), "=", color.FgCyan)
 
 	startTime := time.Now().Unix()
 	report.StartTime = startTime
 
 	for _, file := range files {
-		ExeScript(file, langType, dir)
+		ExeScript(file, langType, scriptDir)
 	}
 
 	utils.PrintWholeLine(utils.I118Prt.Sprintf("end_execution", ""), "=", color.FgCyan)
@@ -26,12 +26,12 @@ func ExeScripts(files []string, dir string, langType string, report *model.TestR
 	report.Duration = secs
 }
 
-func ExeScript(file string, langType string, dir string) {
+func ExeScript(file string, langType string, scriptDir string) {
 	var command string
 	var logFile string
 
 	//if !utils.IsWin() {
-	logFile = utils.ScriptToLogName(dir, file)
+	logFile = utils.ScriptToLogName(scriptDir, file)
 	command = file
 
 	//if langType == misc.PHP.String() {

src/utils/constant.go

 package utils
 
 import (
+	"fmt"
 	"github.com/easysoft/zentaoatf/src/misc"
 	"github.com/easysoft/zentaoatf/src/model"
 	"github.com/jroimartin/gocui"
+	"os"
 )
 
-const (
+var (
 	PreferenceFile = "preferences.yaml"
 	ConfigFile     = "conf.yaml"
 
@@ -21,11 +23,11 @@ const (
 	LanguageEN      = "en"
 	LanguageZH      = "zh"
 
-	EnRes = "res/messages_en.json"
-	ZhRes = "res/messages_zh.json"
+	EnRes = fmt.Sprintf("res%smessages_en.json", string(os.PathSeparator))
+	ZhRes = fmt.Sprintf("res%smessages_zh.json", string(os.PathSeparator))
 
-	ScriptDir = "scripts/"
-	LogDir    = "logs/"
+	ScriptDir = fmt.Sprintf("scripts%s", string(os.PathSeparator))
+	LogDir    = fmt.Sprintf("logs%s", string(os.PathSeparator))
 
 	LeftWidth = 36
 	MinWidth  = 130