StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(build): remove specific string tests

Browse Source 
What we really want to test is if the variable is set/defined/non-empty.

(cherry picked from commit af78a42187faf96dcc2c278062975a5a23a5ac5a)
This commit is contained in:
Maxim Biro 2020-06-20 19:34:47 -04:00 committed by Anthony Bilinski
parent 1900592646
commit 33a89c24ee
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
windows/cross-compile/build.sh
View File

@ -297,7 +297,7 @@ then
# which happens when building Qt # which happens when building Qt
CONFIGURE_EXTRA="" CONFIGURE_EXTRA=""
set +u set +u
if [[ "$TRAVIS_CI_STAGE" == "stage1" ]] if [[ -n "$TRAVIS_CI_STAGE" ]]
then then
CONFIGURE_EXTRA="-silent" CONFIGURE_EXTRA="-silent"
fi fi
@ -1186,8 +1186,9 @@ echo "
SET(CMAKE_FIND_ROOT_PATH /usr/$ARCH-w64-mingw32 $CMAKE_FIND_ROOT_PATH) SET(CMAKE_FIND_ROOT_PATH /usr/$ARCH-w64-mingw32 $CMAKE_FIND_ROOT_PATH)
" > toolchain.cmake " > toolchain.cmake
# Run tests using Wine
set +u set +u
if [[ "$TRAVIS_CI_STAGE" == "stage3" ]] if [[ -n "$TRAVIS_CI_STAGE" ]]
then then
echo "SET(TEST_CROSSCOMPILING_EMULATOR /usr/bin/wine)" >> toolchain.cmake echo "SET(TEST_CROSSCOMPILING_EMULATOR /usr/bin/wine)" >> toolchain.cmake
fi fi
@ -1283,9 +1284,9 @@ do
done < /tmp/$ARCH-qtox-dll-find done < /tmp/$ARCH-qtox-dll-find
# Run tests # Run tests (only on Travis)
set +u set +u
if [[ "$TRAVIS_CI_STAGE" == "stage3" ]] if [[ -n "$TRAVIS_CI_STAGE" ]]
then then
# Add libgcc_s_*.dll, libwinpthread-1.dll, QtTest.dll, etc. into PATH env var of wine # Add libgcc_s_*.dll, libwinpthread-1.dll, QtTest.dll, etc. into PATH env var of wine
export WINEPATH=`cd $QTOX_PREFIX_DIR ; winepath -w $(pwd)`\;`winepath -w $QT_PREFIX_DIR/bin/` export WINEPATH=`cd $QTOX_PREFIX_DIR ; winepath -w $(pwd)`\;`winepath -w $QT_PREFIX_DIR/bin/`