test script modifications

This commit is contained in:
Joseph Henry
2016-08-29 17:00:22 -07:00
parent 30fff57b2f
commit a8262fd6c0
4 changed files with 49 additions and 19 deletions

View File

@@ -4,17 +4,20 @@ echo "\n\n\n\nStarting server(s)"
# test.sh [udp|tcp|all] [nwid]
TEST_EXECUTABLE_PATH="build/tests"
LIB_PATH="./build/libztintercept.so"
PLATFORM="Linux"
protocol=$1
NWID=$2
ZT_HOME_PATH=$3
HOME_DIR=$(pwd)/$TEST_EXECUTABLE_PATH
ZT_HOME_PATH=$(pwd)/$TEST_EXECUTABLE_PATH/zerotier
BUILD_PATH=$(pwd)/build
TEST_PATH=$(pwd)/build/tests
localAddr="127.0.0.1"
export ZT_NC_NETWORK=$ZT_HOME_PATH/nc_$NWID
export DYLD_LIBRARY_PATH=.$HOME_DIR/libztintercept.so
export LD_PRELOAD=$LIB_PATH
echo "network = " $NWID
echo "protocol = " $protocol
@@ -34,12 +37,12 @@ if [ $protocol="tcp" ]; then
echo "Starting TCP test..."
random_tcp_server_port=$RANDOM
echo $random_tcp_server_port > $TEST_EXECUTABLE_PATH/tcp_server.port
./$TEST_EXECUTABLE_PATH/Darwin.tcp_server.out $random_tcp_server_port &
./$TEST_EXECUTABLE_PATH/$PLATFORM.tcp_server.out $random_tcp_server_port &
tcp_server_pid=$!
# echo "TCP SERVER AT = " $localAddr ":" $random_tcp_server_port
# sleep 3
# ./$TEST_EXECUTABLE_PATH/Darwin.tcp_client.out $localAddr $random_tcp_server_port &
# ./$TEST_EXECUTABLE_PATH/$PLATFORM.tcp_client.out $localAddr $random_tcp_server_port &
# tcp_client_pid=$!
fi

View File

@@ -5,6 +5,6 @@ echo "Performing unit tests..."
chmod 755 build/tests/servers.sh
chmod 755 build/tests/clients.sh
./build/tests/servers.sh $1 $2 &
./servers.sh $1 $2 $3 &
sleep 3
./build/tests/clients.sh $1 $2 &
./clients.sh $1 $2 $3 &