github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

update file paths

pull/255/head
Darien Raymond 2016-08-20 21:03:50 +02:00
parent 07a86f549b
commit fdeb8b4f89
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/point/config_json_test.go
View File

@ -18,7 +18,7 @@ func TestClientSampleConfig(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") baseDir := filepath.Join(GOPATH, "src", "v2ray.com", "core", "tools", "release", "config")
pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json")) pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json"))
assert.Error(err).IsNil() assert.Error(err).IsNil()
@ -38,7 +38,7 @@ func TestServerSampleConfig(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") baseDir := filepath.Join(GOPATH, "src", "v2ray.com", "core", "tools", "release", "config")
pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json")) pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json"))
assert.Error(err).IsNil() assert.Error(err).IsNil()

4
testing/scenarios/server_env.go
View File

@ -34,11 +34,11 @@ func GetTestBinaryPath() string {
} }
func GetSourcePath() string { func GetSourcePath() string {
return filepath.Join("github.com", "v2ray", "v2ray-core", "shell", "point", "main") return filepath.Join("v2ray.com", "core", "shell", "point", "main")
} }
func TestFile(filename string) string { func TestFile(filename string) string {
return filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "v2ray", "v2ray-core", "testing", "scenarios", "data", filename) return filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "testing", "scenarios", "data", filename)
} }
func InitializeServerSetOnce(testcase string) error { func InitializeServerSetOnce(testcase string) error {

2
tools/build/config.go
View File

@ -25,7 +25,7 @@ func copyConfigFile(src, dest string, goOS GoOS, format bool) error {
func copyConfigFiles(dir string, goOS GoOS) error { func copyConfigFiles(dir string, goOS GoOS) error {
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
srcDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") srcDir := filepath.Join(GOPATH, "src", "v2ray.com", "core", "tools", "release", "config")
src := filepath.Join(srcDir, "vpoint_socks_vmess.json") src := filepath.Join(srcDir, "vpoint_socks_vmess.json")
dest := filepath.Join(dir, "vpoint_socks_vmess.json") dest := filepath.Join(dir, "vpoint_socks_vmess.json")
if goOS == Windows || goOS == MacOS { if goOS == Windows || goOS == MacOS {

2
tools/git/git.go
View File

@ -13,7 +13,7 @@ const (
func getRepoRoot() string { func getRepoRoot() string {
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
return filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core") return filepath.Join(GOPATH, "src", "v2ray.com", "core")
} }
func RevParse(args ...string) (string, error) { func RevParse(args ...string) (string, error) {