octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-25 14:17:42 +00:00
Code Issues Releases Wiki Activity

Use relocated command folders in build.go and run_integration_tests.go

Browse Source 
The resulting command structure is almost compatible to that of that gb
reference project (example-gsftp), as the subfolder for commands is
'cmds' instead of 'cmd'.
This commit is contained in:
Fabian Wickborn 2016-02-22 21:03:07 +01:00
parent 442780f214
commit ee494ab939
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.go
View File

@ -329,13 +329,17 @@ func main() {
} }
verbosePrintf("create GOPATH at %v\n", gopath) verbosePrintf("create GOPATH at %v\n", gopath)
if err = updateGopath(gopath, filepath.Join(root, "src"), ""); err != nil { if err = updateGopath(gopath, filepath.Join(root, "src", "restic"), "restic"); err != nil {
die("copying files from %v to %v failed: %v\n", root, gopath, err) die("copying files from %v/src/restic to %v/src/restic failed: %v\n", root, gopath, err)
}
if err = updateGopath(gopath, filepath.Join(root, "src", "cmds"), "cmds"); err != nil {
die("copying files from %v/src/cmds to %v/src/restic/cmds failed: %v\n", root, gopath, err)
} }
vendor := filepath.Join(root, "vendor", "src") vendor := filepath.Join(root, "vendor", "src")
if err = updateGopath(gopath, vendor, ""); err != nil { if err = updateGopath(gopath, vendor, ""); err != nil {
die("copying files from %v to %v failed: %v\n", root, gopath, err) die("copying files from %v to %v/src failed: %v\n", vendor, gopath, err)
} }
defer func() { defer func() {
@ -372,7 +376,7 @@ func main() {
args := []string{ args := []string{
"-tags", strings.Join(buildTags, " "), "-tags", strings.Join(buildTags, " "),
"-ldflags", ldflags, "-ldflags", ldflags,
"-o", output, "restic/cmd/restic", "-o", output, "cmds/restic",
} }
err = build(filepath.Join(gopath, "src"), gopath, args...) err = build(filepath.Join(gopath, "src"), gopath, args...)

4
run_integration_tests.go
View File

@ -171,7 +171,7 @@ func (env *TravisEnvironment) RunTests() {
"-arch", strings.Join(env.goxArch, " "), "-arch", strings.Join(env.goxArch, " "),
"-tags", tags, "-tags", tags,
"-output", "/tmp/{{.Dir}}_{{.OS}}_{{.Arch}}", "-output", "/tmp/{{.Dir}}_{{.OS}}_{{.Arch}}",
"restic/cmd/restic") "cmds/restic")
} }
} }
@ -192,7 +192,7 @@ func (env *TravisEnvironment) RunTests() {
} }
// run the tests and gather coverage information // run the tests and gather coverage information
runWithEnv(envWithGOPATH, "gotestcover", "-coverprofile", "all.cov", "restic/...") runWithEnv(envWithGOPATH, "gotestcover", "-coverprofile", "all.cov", "cmds/...", "restic/...")
runGofmt() runGofmt()