From ecc39e196e72360074df79a12021f6ce1314f02b Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 2 Jul 2015 10:20:32 +0200 Subject: [PATCH] travis: use Ninja, fix imgur_upload.sh to correctly display wget instructions and use only WARNING verbosity --- .travis.yml | 6 +++--- LinphoneTester/MasterViewController.m | 2 +- Tools/imgur_upload.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3aebed95..558c96bbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: before_install: - brew update 1>/dev/null - - brew install doxygen nasm gettext yasm optipng imagemagick coreutils intltool + - brew install doxygen nasm gettext yasm optipng imagemagick coreutils intltool ninja - brew outdated cmake || brew upgrade cmake - brew link gettext --force - brew tap Gui13/linphone @@ -25,8 +25,8 @@ before_install: - git submodule update --init --recursive install: - - ./prepare.py i386 - - make -j1 -s 1>/dev/null + - ./prepare.py i386 -G Ninja + - make -j4 -s 1>/dev/null - mkdir -p $KIF_SCREENSHOTS script: diff --git a/LinphoneTester/MasterViewController.m b/LinphoneTester/MasterViewController.m index e338cbcc3..53e1f0ff5 100644 --- a/LinphoneTester/MasterViewController.m +++ b/LinphoneTester/MasterViewController.m @@ -42,7 +42,7 @@ NSString* const kLogsUpdateNotification = @"kLogsUpdateNotification"; lastLogs = [[NSMutableArray alloc] initWithCapacity:kLastLogsCapacity]; logsBuffer = [NSMutableArray arrayWithCapacity:kLogsBufferCapacity]; - // linphone_core_set_log_level(ORTP_MESSAGE); + linphone_core_set_log_level(ORTP_WARNING); linphone_core_set_log_handler((OrtpLogFunc)linphone_iphone_log_handler); } diff --git a/Tools/imgur_upload.sh b/Tools/imgur_upload.sh index d22d53c01..d7277ff44 100755 --- a/Tools/imgur_upload.sh +++ b/Tools/imgur_upload.sh @@ -27,12 +27,12 @@ if [ ! -z "$(find . -name "*.png")" ]; then if [ "$succeeded" != "true" ]; then echo "There was a problem uploading \"$filepath\": $result" else - download_cmds="${download_cmds}wget $(echo "$result" | underscore extract 'data.link')\n" + download_cmds="${download_cmds}\nwget $(echo "$result" | underscore extract 'data.link')" fi done echo "All uploads complete!" echo "" - echo "Download via: $download_cmds" + printf "Download via: $download_cmds\n" else echo "Could not find any PNG in $PWD, something must be broken!" fi