lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-01 00:00:53 +00:00
Code Issues Releases Activity

resolve some merge problem

Browse Source
This commit is contained in:
shxsun 2013-09-24 10:49:01 +08:00
commit 18de4eb4c5
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
new.go
View File

@ -108,7 +108,7 @@ func createApp(cmd *Command, args []string) {
writetofile(path.Join(apppath, "views", "index.tpl"), indextpl) writetofile(path.Join(apppath, "views", "index.tpl"), indextpl)
fmt.Println(path.Join(apppath, "main.go")) fmt.Println(path.Join(apppath, "main.go"))
writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), string(path.Separator)), -1)) writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
colorLog("[SUCC] New application successfully created!\n") colorLog("[SUCC] New application successfully created!\n")
} }

7
test.go
View File

@ -5,8 +5,6 @@ import (
"os/exec" "os/exec"
path "path/filepath" path "path/filepath"
"time" "time"
// "bytes"
) )
var cmdTest = &Command{ var cmdTest = &Command{
@ -82,15 +80,10 @@ func runTest() {
var err error var err error
icmd := exec.Command("go", "test") icmd := exec.Command("go", "test")
//var out,errbuffer bytes.Buffer
//icmd.Stdout = &out
//icmd.Stderr = &errbuffer
icmd.Stdout = os.Stdout icmd.Stdout = os.Stdout
icmd.Stderr = os.Stderr icmd.Stderr = os.Stderr
colorLog("[TRAC] ============== Test Begin ===================\n") colorLog("[TRAC] ============== Test Begin ===================\n")
err = icmd.Run() err = icmd.Run()
//colorLog(out.String())
//colorLog(errbuffer.String())
colorLog("[TRAC] ============== Test End ===================\n") colorLog("[TRAC] ============== Test End ===================\n")
if err != nil { if err != nil {