pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #1156 from Zverik/no_oh_tests

Browse source 
[build] Disable opening_hours tests for gtool profile
This commit is contained in:
Alex Zolotarev 2015-12-29 18:27:49 +03:00
commit c6e2a7a8b0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
3party/3party.pro
View file

@ -12,7 +12,8 @@ SUBDIRS = freetype fribidi minizip jansson tomcrypt protobuf osrm expat succinct
# TODO(mgsrergio): Move opening hours out of 3party to the main project tree.
# See https://trello.com/c/tWYSnXSS/22-opening-hours-3party-boost-test-framework.
SUBDIRS *= opening_hours
CONFIG(desktop):!CONFIG(no-tests) {
# Disable tests for gtool profile, since it needs only routing tests.
CONFIG(desktop):!CONFIG(no-tests):!CONFIG(gtool) {
opening_hours_tests.subdir = opening_hours/opening_hours_tests
opening_hours_tests.depends = opening_hours
SUBDIRS *= opening_hours_tests

2
tools/unix/build_omim.sh
View file

@ -113,7 +113,7 @@ build_conf_osrm()
export BOOST_INCLUDEDIR="$BOOST_PATH/include"
cd "$DIRNAME"
if [ -n "$DEVTOOLSET_PATH" ]; then
"$QMAKE" "$OMIM_PATH/omim.pro" -spec $OSPEC "CONFIG+=$CONF osrm" \
"$QMAKE" "$OMIM_PATH/omim.pro" -spec $OSPEC "CONFIG+=$CONF osrm no-tests" \
"QMAKE_CXXFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr" \
"QMAKE_LFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr"
else