Alawn/v2ray-core
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core synced 2024-02-27 03:18:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v5

Browse Source
This commit is contained in:
loyalsoldier
2020-12-03 00:01:36 +08:00
parent 9c1ad3ab93 45aeaa8080
commit 483103a16b
9 changed files with 38 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/coverage/coverall
-48
View File
@@ -1,48 +0,0 @@
#!/bin/bash
FAIL=0
V2RAY_OUT=${PWD}/out/v2ray
export V2RAY_COV=${V2RAY_OUT}/cov
COVERAGE_FILE=${V2RAY_COV}/coverage.txt
function test_package {
DIR=".$1"
DEP=$(go list -f '{{ join .Deps "\n" }}' $DIR | grep v2ray | tr '\n' ',')
DEP=${DEP}$DIR
RND_NAME=$(openssl rand -hex 16)
COV_PROFILE=${V2RAY_COV}/${RND_NAME}.out
go test -tags "json coverage" -coverprofile=${COV_PROFILE} -coverpkg=$DEP $DIR || FAIL=1
}
rm -rf ${V2RAY_OUT}
mkdir -p ${V2RAY_COV}
touch ${COVERAGE_FILE}
TEST_FILES=(./*_test.go)
if [ -f ${TEST_FILES[0]} ]; then
test_package ""
fi
for DIR in $(find * -type d ! -path "*.git*" ! -path "*vendor*" ! -path "*external*"); do
TEST_FILES=($DIR/*_test.go)
if [ -f ${TEST_FILES[0]} ]; then
test_package "/$DIR"
fi
done
for OUT_FILE in $(find ${V2RAY_COV} -name "*.out"); do
echo "Merging file ${OUT_FILE}"
cat ${OUT_FILE} | grep -v "mode: set" >> ${COVERAGE_FILE}
done
COV_SORTED=${V2RAY_COV}/coverallsorted.out
cat ${COVERAGE_FILE} | sort -t: -k1 | grep -vw "testing" | grep -v ".pb.go" | grep -vw "vendor" | grep -vw "external" > ${COV_SORTED}
echo "mode: set" | cat - ${COV_SORTED} > ${COVERAGE_FILE}
if [ "$FAIL" -eq 0 ]; then
echo "Uploading coverage datea to codecov."
#bash <(curl -s https://codecov.io/bash) -f ${COVERAGE_FILE} -v || echo "Codecov did not collect coverage reports."
fi
exit $FAIL
testing/coverage/coverall2 → testing/coverage/coverall.sh
+4 -5
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
COVERAGE_FILE=${PWD}/coverage.txt
COV_SORTED=${PWD}/coverallsorted.out
@@ -19,8 +19,7 @@ if [ -f "${TEST_FILES[0]}" ]; then
test_package ""
fi
# shellcheck disable=SC2044
for DIR in $(find ./* -type d ! -path "*.git*" ! -path "*vendor*" ! -path "*external*"); do
for DIR in $(find ./* -type d ! -path "*.git*"); do
TEST_FILES=("$DIR"/*_test.go)
if [ -f "${TEST_FILES[0]}" ]; then
test_package "/$DIR"
@@ -34,7 +33,7 @@ do
< "${OUT_FILE}" grep -v "mode: set" >> "$COVERAGE_FILE"
done < <(find ./* -name "*.out" -print0)
< "$COVERAGE_FILE" sort -t: -k1 | grep -vw "testing" | grep -v ".pb.go" | grep -vw "vendor" | grep -vw "external" > "$COV_SORTED"
< "$COVERAGE_FILE" sort -t: -k1 | grep -vw "testing" | grep -v ".pb.go" > "$COV_SORTED"
echo "mode: set" | cat - "${COV_SORTED}" > "${COVERAGE_FILE}"
bash <(curl -s https://codecov.io/bash) || echo 'Codecov failed to upload'
bash <(curl -s https://codecov.io/bash) || echo 'Codecov failed to upload'
testing/servers/tcp/port.go
+11 -7
View File
@@ -1,16 +1,20 @@
package tcp
import (
"v2ray.com/core/common"
"v2ray.com/core/common/net"
)
import "v2ray.com/core/common/net"
// PickPort returns an unused TCP port in the system. The port returned is highly likely to be unused, but not guaranteed.
// PickPort returns an unused TCP port of the system.
func PickPort() net.Port {
listener, err := net.Listen("tcp4", "127.0.0.1:0")
common.Must(err)
listener := pickPort()
defer listener.Close()
addr := listener.Addr().(*net.TCPAddr)
return net.Port(addr.Port)
}
func pickPort() net.Listener {
listener, err := net.Listen("tcp4", "127.0.0.1:0")
if err != nil {
listener = pickPort()
}
return listener
}
testing/servers/udp/port.go
+14 -10
View File
@@ -1,19 +1,23 @@
package udp
import (
"v2ray.com/core/common"
"v2ray.com/core/common/net"
)
import "v2ray.com/core/common/net"
// PickPort returns an unused UDP port in the system. The port returned is highly likely to be unused, but not guaranteed.
// PickPort returns an unused UDP port of the system.
func PickPort() net.Port {
conn, err := net.ListenUDP("udp4", &net.UDPAddr{
IP: net.LocalHostIP.IP(),
Port: 0,
})
common.Must(err)
conn := pickPort()
defer conn.Close()
addr := conn.LocalAddr().(*net.UDPAddr)
return net.Port(addr.Port)
}
func pickPort() *net.UDPConn {
conn, err := net.ListenUDP("udp4", &net.UDPAddr{
IP: net.LocalHostIP.IP(),
Port: 0,
})
if err != nil {
conn = pickPort()
}
return conn
}