Skip to content
Permalink
Browse files

fix(travis-ci): resolve broken tests (#2440)

  • Loading branch information...
dgibbs64 committed Jul 10, 2019
1 parent ee22552 commit e054678803794cb6d56311a52697f064f71075a0
@@ -109,7 +109,7 @@ glibc="2.17"
## Server Specific Directories
systemdir="${serverfiles}"
executabledir="${systemdir}"
executable="./DedicatedServer"
executable="./Launch_DedicatedServer"
servercfg="serversettings.xml"
servercfgdefault="serversettings.xml"
servercfgdir="${systemdir}"
@@ -20,8 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi

travistest="1"
version="v19.6.0"
version="v19.9.0"
shortname="fctr"
gameservername="fctrserver"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
@@ -48,6 +47,9 @@ userinput="${1}"
if [ ! -v TRAVIS ]; then
TRAVIS_BRANCH="develop"
TRAVIS_BUILD_DIR="${rootdir}"
else
servicename="travis"
travistest="1"
fi

## GitHub Branch Select
@@ -381,7 +383,7 @@ else
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
fn_ansi_loader
# Prevents running of core_exit.sh for Travis-CI.
if [ "${travistest}" != "1" ]; then
if [ -z "${travistest}" ]; then
getopt=$1
core_getopt.sh
fi
@@ -782,7 +784,6 @@ grep functionfile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/functionfile=//g
echo ""
echo "5.0 - Monitor Tests"
echo "=================================================================="

echo ""
echo "Server IP - Port: ${ip}:${port}"
echo "Server IP - Query Port: ${ip}:${queryport}"
@@ -20,8 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi

travistest="1"
version="v19.6.0"
version="v19.9.0"
shortname="jc2"
gameservername="jc2server"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
@@ -48,6 +47,9 @@ userinput="${1}"
if [ ! -v TRAVIS ]; then
TRAVIS_BRANCH="develop"
TRAVIS_BUILD_DIR="${rootdir}"
else
servicename="travis"
travistest="1"
fi

## GitHub Branch Select
@@ -65,8 +67,6 @@ core_functions.sh(){

# Bootstrap
# Fetches the core functions required before passed off to core_dl.sh.

# Fetches core functions.
fn_bootstrap_fetch_file(){
remote_fileurl="${1}"
local_filedir="${2}"
@@ -281,15 +281,15 @@ if [ "$(whoami)" == "root" ]; then
fi
fi

# Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
if [ ! -f "${serverlist}" ]; then
echo "[ FAIL ] serverlist.csv could not be loaded."
exit 1
fi

# LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
if [ ! -f "${serverlist}" ]; then
echo "[ FAIL ] serverlist.csv could not be loaded."
exit 1
fi

if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
{
tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'
@@ -381,7 +381,7 @@ else
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
fn_ansi_loader
# Prevents running of core_exit.sh for Travis-CI.
if [ "${travistest}" != "1" ]; then
if [ -z "${travistest}" ]; then
getopt=$1
core_getopt.sh
fi
@@ -20,8 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi

travistest="1"
version="v19.6.0"
version="v19.9.0"
shortname="mc"
gameservername="mcserver"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
@@ -48,6 +47,9 @@ userinput="${1}"
if [ ! -v TRAVIS ]; then
TRAVIS_BRANCH="develop"
TRAVIS_BUILD_DIR="${rootdir}"
else
servicename="travis"
travistest="1"
fi

## GitHub Branch Select
@@ -65,8 +67,6 @@ core_functions.sh(){

# Bootstrap
# Fetches the core functions required before passed off to core_dl.sh.

# Fetches core functions.
fn_bootstrap_fetch_file(){
remote_fileurl="${1}"
local_filedir="${2}"
@@ -281,15 +281,15 @@ if [ "$(whoami)" == "root" ]; then
fi
fi

# Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
if [ ! -f "${serverlist}" ]; then
echo "[ FAIL ] serverlist.csv could not be loaded."
exit 1
fi

# LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
if [ ! -f "${serverlist}" ]; then
echo "[ FAIL ] serverlist.csv could not be loaded."
exit 1
fi

if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
{
tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'
@@ -381,7 +381,7 @@ else
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
fn_ansi_loader
# Prevents running of core_exit.sh for Travis-CI.
if [ "${travistest}" != "1" ]; then
if [ -z "${travistest}" ]; then
getopt=$1
core_getopt.sh
fi
@@ -20,8 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi

travistest="1"
version="v19.6.0"
version="v19.9.0"
shortname="ts3"
gameservername="ts3server"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
@@ -48,6 +47,9 @@ userinput="${1}"
if [ ! -v TRAVIS ]; then
TRAVIS_BRANCH="develop"
TRAVIS_BUILD_DIR="${rootdir}"
else
servicename="travis"
travistest="1"
fi

## GitHub Branch Select
@@ -65,8 +67,6 @@ core_functions.sh(){

# Bootstrap
# Fetches the core functions required before passed off to core_dl.sh.

# Fetches core functions.
fn_bootstrap_fetch_file(){
remote_fileurl="${1}"
local_filedir="${2}"
@@ -281,15 +281,15 @@ if [ "$(whoami)" == "root" ]; then
fi
fi

# Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
if [ ! -f "${serverlist}" ]; then
echo "[ FAIL ] serverlist.csv could not be loaded."
exit 1
fi

# LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
if [ ! -f "${serverlist}" ]; then
echo "[ FAIL ] serverlist.csv could not be loaded."
exit 1
fi

if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
{
tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'
@@ -381,7 +381,7 @@ else
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
fn_ansi_loader
# Prevents running of core_exit.sh for Travis-CI.
if [ "${travistest}" != "1" ]; then
if [ -z "${travistest}" ]; then
getopt=$1
core_getopt.sh
fi

0 comments on commit e054678

Please sign in to comment.
You can’t perform that action at this time.