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

update

pull/298/head^2
v2ray 2016-06-04 12:41:48 +02:00
parent a4d76dc394
commit 243e3ced89
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/scenarios/data/test_4_client.json
View File

@ -1,7 +1,7 @@
{ {
"port": 50030, "port": 50030,
"log": { "log": {
"loglevel": "debug" "loglevel": "info"
}, },
"inbound": { "inbound": {
"listen": "127.0.0.1", "listen": "127.0.0.1",

2
testing/scenarios/data/test_4_server.json
View File

@ -1,7 +1,7 @@
{ {
"port": 50031, "port": 50031,
"log": { "log": {
"loglevel": "debug" "loglevel": "info"
}, },
"inbound": { "inbound": {
"listen": "127.0.0.1", "listen": "127.0.0.1",

6
testing/scenarios/server_env.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"runtime"
_ "github.com/v2ray/v2ray-core/app/router/rules" _ "github.com/v2ray/v2ray-core/app/router/rules"
"github.com/v2ray/v2ray-core/common/log" "github.com/v2ray/v2ray-core/common/log"
@ -35,7 +36,10 @@ func BuildV2Ray() error {
if err != nil { if err != nil {
return err return err
} }
binaryPath = filepath.Join(dir, "v2ray.exe") binaryPath = filepath.Join(dir, "v2ray")
if runtime.GOOS == "windows" {
binaryPath += ".exe"
}
cmd := exec.Command("go", "build", "-tags=json", "-o="+binaryPath, filepath.Join("github.com", "v2ray", "v2ray-core", "release", "server")) cmd := exec.Command("go", "build", "-tags=json", "-o="+binaryPath, filepath.Join("github.com", "v2ray", "v2ray-core", "release", "server"))
return cmd.Run() return cmd.Run()
} }