From 132819c9688fd934048ea4072d84e339bde45269 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Mon, 28 Dec 2015 13:23:05 +0300 Subject: [PATCH 1/2] [build] Disable opening_hours tests for gtool profile --- 3party/3party.pro | 2 +- tools/unix/build_omim.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3party/3party.pro b/3party/3party.pro index 9a65c0f9f4..03e19ac6b8 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -12,7 +12,7 @@ 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) { +CONFIG(desktop):!CONFIG(no-tests):!CONFIG(gtool):!CONFIG(osrm) { opening_hours_tests.subdir = opening_hours/opening_hours_tests opening_hours_tests.depends = opening_hours SUBDIRS *= opening_hours_tests diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh index e8b048395b..2bb184f8e2 100755 --- a/tools/unix/build_omim.sh +++ b/tools/unix/build_omim.sh @@ -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 From 756d7ed1dbd72e64fe2cf3639a731c6fbe737acf Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Tue, 29 Dec 2015 15:48:07 +0300 Subject: [PATCH 2/2] Add comment about disabling tests --- 3party/3party.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/3party/3party.pro b/3party/3party.pro index 03e19ac6b8..49f5a11ead 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -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):!CONFIG(gtool):!CONFIG(osrm) { +# 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