mirror of
https://github.com/alliedmodders/metamod-source.git
synced 2025-02-21 14:54:14 +01:00
Add additional test coverage to Travis-CI. (#50)
* NPOTB: clang clang clang goes the trolly, gcc7 goes the bell. * Update AMBuildScript * Initialize engine_path when abspath fails. * Fix lptr being uninitialized when getcwd fails. * Remove GCC6; deeper issues than this PR will cover
This commit is contained in:
parent
ad00df3864
commit
e573602f81
109
.travis.yml
109
.travis.yml
@ -1,32 +1,107 @@
|
|||||||
|
git:
|
||||||
|
depth: 3
|
||||||
|
|
||||||
|
sudo: false
|
||||||
|
language: cpp
|
||||||
|
os: linux
|
||||||
|
dist: trusty
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
|
||||||
- clang-3.7
|
|
||||||
- lib32stdc++6
|
|
||||||
- lib32z1-dev
|
|
||||||
- libc6-dev-i386
|
|
||||||
- linux-libc-dev
|
|
||||||
- g++-multilib
|
|
||||||
- g++-4.8
|
|
||||||
sources:
|
sources:
|
||||||
- llvm-toolchain-precise-3.7
|
- ubuntu-toolchain-r-test
|
||||||
- ubuntu-toolchain-r-test
|
- llvm-toolchain-trusty-3.9
|
||||||
language: cpp
|
- llvm-toolchain-trusty-4.0
|
||||||
sudo: false
|
- llvm-toolchain-trusty-5.0
|
||||||
compiler:
|
packages:
|
||||||
- clang
|
- lib32stdc++6
|
||||||
|
- lib32z1-dev
|
||||||
|
- libc6-dev-i386
|
||||||
|
- linux-libc-dev
|
||||||
|
- g++-multilib
|
||||||
|
# - clang-3.6
|
||||||
|
# - clang-3.8
|
||||||
|
# - clang-4.0
|
||||||
|
# - clang-5.0
|
||||||
|
# - g++-6
|
||||||
|
# - g++-6-multilib
|
||||||
|
- clang-3.9
|
||||||
|
- g++-4.8-multilib
|
||||||
|
- g++-4.8
|
||||||
|
- g++-4.9-multilib
|
||||||
|
- g++-4.9
|
||||||
|
- g++-5-multilib
|
||||||
|
- g++-5
|
||||||
|
- g++-7-multilib
|
||||||
|
- g++-7
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- ../mysql-5.0
|
||||||
|
env:
|
||||||
|
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
|
||||||
|
- MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
|
||||||
|
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
|
||||||
|
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
|
||||||
|
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
fast_finish: true
|
||||||
|
include:
|
||||||
|
- os: linux
|
||||||
|
sudo: false
|
||||||
|
language: cpp
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages: ['clang-3.6', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
|
||||||
|
env: ['MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"']
|
||||||
|
|
||||||
|
- os: linux
|
||||||
|
sudo: false
|
||||||
|
language: cpp
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
|
||||||
|
env: ['MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"']
|
||||||
|
|
||||||
|
- os: linux
|
||||||
|
sudo: false
|
||||||
|
language: cpp
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources: ['llvm-toolchain-trusty-4.0']
|
||||||
|
packages: ['clang-4.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
|
||||||
|
env: ['MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"']
|
||||||
|
|
||||||
|
- os: linux
|
||||||
|
sudo: false
|
||||||
|
language: cpp
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources: ['llvm-toolchain-trusty-5.0']
|
||||||
|
packages: ['clang-5.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
|
||||||
|
env: ['MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"']
|
||||||
|
|
||||||
|
allow_failures:
|
||||||
|
- env: MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
|
||||||
|
- env: MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
|
||||||
|
- env: MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
|
||||||
|
- env: MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
|
||||||
|
- env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
|
||||||
|
- env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
|
||||||
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR
|
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR
|
||||||
script:
|
script:
|
||||||
- mkdir build && cd build
|
- mkdir build && cd build
|
||||||
- PATH="~/.local/bin:$PATH"
|
- PATH="~/.local/bin:$PATH"
|
||||||
- CC=clang-3.7 CXX=clang-3.7 python ../configure.py --enable-optimize --sdks=episode1,tf2,l4d2,csgo,dota
|
- eval "${MATRIX_EVAL}"
|
||||||
|
- python ../configure.py --enable-optimize --sdks=episode1,tf2,l4d2,csgo,dota
|
||||||
- ambuild
|
- ambuild
|
||||||
- cd .. && mkdir build-sh-opt && cd build-sh-opt
|
- cd .. && mkdir build-sh-opt && cd build-sh-opt
|
||||||
- CC=clang-3.7 CXX=clang-3.7 python ../configure.py --enable-optimize --enable-tests --sdks=
|
- python ../configure.py --enable-optimize --enable-tests --sdks=
|
||||||
- ambuild
|
- ambuild
|
||||||
- ./core/sourcehook/test/test_sourcehook/test_sourcehook -v
|
- ./core/sourcehook/test/test_sourcehook/test_sourcehook -v
|
||||||
- cd .. && mkdir build-sh-debug && cd build-sh-debug
|
- cd .. && mkdir build-sh-debug && cd build-sh-debug
|
||||||
- CC=clang-3.7 CXX=clang-3.7 python ../configure.py --enable-debug --enable-tests --sdks=
|
- python ../configure.py --enable-debug --enable-tests --sdks=
|
||||||
- ambuild
|
- ambuild
|
||||||
- ./core/sourcehook/test/test_sourcehook/test_sourcehook -v
|
- ./core/sourcehook/test/test_sourcehook/test_sourcehook -v
|
||||||
|
@ -202,6 +202,8 @@ class MMSConfig(object):
|
|||||||
cxx.cflags += ['-mfpmath=sse']
|
cxx.cflags += ['-mfpmath=sse']
|
||||||
if cxx.family == 'clang':
|
if cxx.family == 'clang':
|
||||||
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
|
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
|
||||||
|
if cxx.version >= 'clang-3.9':
|
||||||
|
cxx.cxxflags += ['-Wno-expansion-to-defined']
|
||||||
if cxx.version >= 'clang-3.6' or cxx.version >= 'apple-clang-7.0':
|
if cxx.version >= 'clang-3.6' or cxx.version >= 'apple-clang-7.0':
|
||||||
cxx.cxxflags += ['-Wno-inconsistent-missing-override']
|
cxx.cxxflags += ['-Wno-inconsistent-missing-override']
|
||||||
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
|
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
|
||||||
|
@ -375,7 +375,13 @@ void InitializeVSP()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
abspath(engine_path, engine_file);
|
|
||||||
|
/* If this fails the file either does not exist or
|
||||||
|
* on Windows the buffer may be too small. */
|
||||||
|
if (abspath(engine_path, engine_file) == NULL)
|
||||||
|
{
|
||||||
|
engine_path[0] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
const char *usepath = metamod_path.c_str();
|
const char *usepath = metamod_path.c_str();
|
||||||
if (UTIL_Relatize(rel_path, sizeof(rel_path), engine_path, metamod_path.c_str()))
|
if (UTIL_Relatize(rel_path, sizeof(rel_path), engine_path, metamod_path.c_str()))
|
||||||
|
@ -130,7 +130,6 @@ mm_DetectGameInformation()
|
|||||||
|
|
||||||
char temp_path[PLATFORM_MAX_PATH];
|
char temp_path[PLATFORM_MAX_PATH];
|
||||||
char cur_path[PLATFORM_MAX_PATH];
|
char cur_path[PLATFORM_MAX_PATH];
|
||||||
getcwd(cur_path, sizeof(cur_path));
|
|
||||||
|
|
||||||
char *ptr;
|
char *ptr;
|
||||||
const char *lptr;
|
const char *lptr;
|
||||||
@ -162,7 +161,10 @@ mm_DetectGameInformation()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
ptr = val;
|
ptr = val;
|
||||||
lptr = cur_path;
|
if (getcwd(cur_path, sizeof(cur_path)))
|
||||||
|
lptr = cur_path;
|
||||||
|
else
|
||||||
|
lptr = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *pRelPath = is_source2 ? "../../" : "";
|
const char *pRelPath = is_source2 ? "../../" : "";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user