Merge branch 'development' of https://git01.codeplex.com/casablanca into quickfixes

stgates · stgates · commit 038195797ea1 · 2015-04-02T10:32:52.000-07:00
diff --git a/Build_iOS/configure.sh b/Build_iOS/configure.sh
@@ -1,15 +1,10 @@
 #!/bin/bash
 set -e
 
-git clone https://git.gitorious.org/boostoniphone/galbraithjosephs-boostoniphone.git boostoniphone
+git clone https://gist.github.com/c629ae4c7168216a9856.git boostoniphone
 pushd boostoniphone
 git apply ../fix_boost_version.patch
 ./boost.sh
-pushd ios/framework/boost.framework/Versions/A
-mkdir Headers2
-mv Headers Headers2/boost
-mv Headers2 Headers
-popd
 popd
 mv boostoniphone/ios/framework/boost.framework .
 
diff --git a/Build_iOS/fix_boost_version.patch b/Build_iOS/fix_boost_version.patch
@@ -1,36 +1,186 @@
-From e5b3bf1392d3dc04f1391c4ad60118a394b5219f Mon Sep 17 00:00:00 2001
-From: Steve Gates <stgates@microsoft.com>
-Date: Thu, 30 Oct 2014 17:42:43 -0700
-Subject: [PATCH] Fixing boost.sh to use Boost version 1.56 and iOS 8.0.
-
----
- boost.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
 diff --git a/boost.sh b/boost.sh
-index 8847aac..2a76aec 100755
+old mode 100644
+new mode 100755
+index 22b308c..07ef184
 --- a/boost.sh
 +++ b/boost.sh
-@@ -18,8 +18,8 @@
+@@ -1,4 +1,4 @@
+-# Builds a Boost framework for the iPhone, iPhone Simulator, and OSX.
++# Builds a Boost framework for the iPhone and iPhone Simulator.
+ # Creates a set of universal libraries that can be used on an iPhone and in the
+ # iPhone simulator. Then creates a pseudo-framework to make using boost in Xcode
+ # less painful.
+@@ -6,27 +6,21 @@
+ # To configure the script, define:
+ #    BOOST_LIBS:        which libraries to build
+ #    IPHONE_SDKVERSION: iPhone SDK version (e.g. 8.1)
+-#    OSX_SDKVERSION: OSX SDK version (e.g. 10.10)
+ #
+ # Then go get the source tar.bz of the boost you want to build, shove it in the
  # same directory as this script, and run "./boost.sh". Grab a cuppa. And voila.
  #===============================================================================
  
--: ${BOOST_LIBS:="filesystem date_time system"}
--: ${IPHONE_SDKVERSION:=7.0}
+-: ${BOOST_VERSION:=1.56.0}
+-: ${BOOST_VERSION2:=1_56_0}
++: ${BOOST_VERSION:=1.57.0}
++: ${BOOST_VERSION2:=1_57_0}
+ 
+-: ${BOOST_LIBS:="atomic chrono date_time exception filesystem program_options random signals system test thread"}
 +: ${BOOST_LIBS:="thread chrono filesystem regex locale system random"}
-+: ${IPHONE_SDKVERSION:=8.0}
- : ${OSX_SDKVERSION:=10.9}
+ 
+ # Current iPhone SDK
+ : ${IPHONE_SDKVERSION:=`xcodebuild -showsdks | grep iphoneos | egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`}
+ # Specific iPhone SDK
+ # : ${IPHONE_SDKVERSION:=8.1}
+ 
+-# Current OSX SDK
+-: ${OSX_SDKVERSION:=`xcodebuild -showsdks | grep macosx | egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`}
+-# Specific OSX SDK
+-# : ${OSX_SDKVERSION:=10.10}
+-
  : ${XCODE_ROOT:=`xcode-select -print-path`}
- : ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -std=c++11 -stdlib=libc++"}
-@@ -84,7 +84,7 @@ updateBoost()
- 	then
- 		git checkout $BOOST_SRC/tools/build/v2/user-config.jam
- 	else
--		git clone --recursive https://github.com/boostorg/boost.git $BOOST_SRC
-+		git clone --recursive --branch boost-1.56.0 https://github.com/boostorg/boost.git $BOOST_SRC
- 		pushd $BOOST_SRC
- 		./bootstrap.sh
- 		./b2 headers
--- 
-1.9.3 (Apple Git-50)
-
+ : ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -g -DNDEBUG -std=c++11 -stdlib=libc++"}
+ 
+@@ -41,10 +35,8 @@
+ : ${TARBALLDIR:=`pwd`}
+ : ${SRCDIR:=`pwd`/src}
+ : ${IOSBUILDDIR:=`pwd`/ios/build}
+-: ${OSXBUILDDIR:=`pwd`/osx/build}
+ : ${PREFIXDIR:=`pwd`/ios/prefix}
+ : ${IOSFRAMEWORKDIR:=`pwd`/ios/framework}
+-: ${OSXFRAMEWORKDIR:=`pwd`/osx/framework}
+ 
+ BOOST_TARBALL=$TARBALLDIR/boost_$BOOST_VERSION2.tar.bz2
+ BOOST_SRC=$SRCDIR/boost_${BOOST_VERSION2}
+@@ -52,7 +44,6 @@ BOOST_SRC=$SRCDIR/boost_${BOOST_VERSION2}
+ #===============================================================================
+ ARM_DEV_CMD="xcrun --sdk iphoneos"
+ SIM_DEV_CMD="xcrun --sdk iphonesimulator"
+-OSX_DEV_CMD="xcrun --sdk macosx"
+ 
+ #===============================================================================
+ # Functions
+@@ -79,12 +70,10 @@ cleanEverythingReadyToStart()
+ {
+     echo Cleaning everything before we start to build...
+ 
+-    rm -rf iphone-build iphonesim-build osx-build
++    rm -rf iphone-build iphonesim-build
+     rm -rf $IOSBUILDDIR
+-    rm -rf $OSXBUILDDIR
+     rm -rf $PREFIXDIR
+     rm -rf $IOSFRAMEWORKDIR/$FRAMEWORK_NAME.framework
+-    rm -rf $OSXFRAMEWORKDIR/$FRAMEWORK_NAME.framework
+ 
+     doneSection
+ }
+@@ -142,11 +131,6 @@ using darwin : ${IPHONE_SDKVERSION}~iphonesim
+ : <striper> <root>$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer
+ : <architecture>x86 <target-os>iphone
+ ;
+-using darwin : ${OSX_SDKVERSION}
+-: g++ -arch i386 -arch x86_64 -fvisibility=hidden -fvisibility-inlines-hidden $EXTRA_CPPFLAGS
+-: <striper> <root>$XCODE_ROOT/Platforms/MacOSX.platform/Developer
+-: <architecture>x86 <target-os>darwin
+-;
+ EOF
+ 
+     doneSection
+@@ -192,10 +176,6 @@ buildBoostForIPhoneOS()
+     echo Building Boost for iPhoneSimulator
+     ./b2 -j16 --build-dir=iphonesim-build --stagedir=iphonesim-build/stage toolset=darwin-${IPHONE_SDKVERSION}~iphonesim architecture=x86 target-os=iphone macosx-version=iphonesim-${IPHONE_SDKVERSION} link=static stage
+     doneSection
+-
+-    echo building Boost for OSX
+-    ./b2 -j16 --build-dir=osx-build --stagedir=osx-build/stage toolset=clang cxxflags="-std=c++11 -stdlib=libc++ -arch i386 -arch x86_64" linkflags="-stdlib=libc++" link=static threading=multi macosx-version=${OSX_SDKVERSION} stage
+-    doneSection
+ }
+ 
+ #===============================================================================
+@@ -233,10 +213,6 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
+     mkdir -p $IOSBUILDDIR/i386/obj
+     mkdir -p $IOSBUILDDIR/x86_64/obj
+ 
+-    # OSX
+-    mkdir -p $OSXBUILDDIR/i386/obj
+-    mkdir -p $OSXBUILDDIR/x86_64/obj
+-
+     ALL_LIBS=""
+ 
+     echo Splitting all existing fat binaries...
+@@ -254,9 +230,6 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
+ 
+         $SIM_DEV_CMD lipo "iphonesim-build/stage/lib/libboost_$NAME.a" -thin i386 -o $IOSBUILDDIR/i386/libboost_$NAME.a
+         $SIM_DEV_CMD lipo "iphonesim-build/stage/lib/libboost_$NAME.a" -thin x86_64 -o $IOSBUILDDIR/x86_64/libboost_$NAME.a
+-
+-        $OSX_DEV_CMD lipo "osx-build/stage/lib/libboost_$NAME.a" -thin i386 -o $OSXBUILDDIR/i386/libboost_$NAME.a
+-        $OSX_DEV_CMD lipo "osx-build/stage/lib/libboost_$NAME.a" -thin x86_64 -o $OSXBUILDDIR/x86_64/libboost_$NAME.a
+     done
+ 
+     echo "Decomposing each architecture's .a files"
+@@ -273,14 +246,10 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
+ 
+         unpackArchive "$IOSBUILDDIR/i386/obj" $NAME
+         unpackArchive "$IOSBUILDDIR/x86_64/obj" $NAME
+-
+-        unpackArchive "$OSXBUILDDIR/i386/obj" $NAME
+-        unpackArchive "$OSXBUILDDIR/x86_64/obj" $NAME
+     done
+ 
+     echo "Linking each architecture into an uberlib ($ALL_LIBS => libboost.a )"
+     rm $IOSBUILDDIR/*/libboost.a
+-    rm $OSXBUILDDIR/*/libboost.a
+ 
+     for NAME in $BOOST_LIBS; do
+         if [ "$NAME" == "test" ]; then
+@@ -300,11 +269,6 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
+         (cd $IOSBUILDDIR/i386;  $SIM_DEV_CMD ar crus libboost.a obj/$NAME/*.o; )
+         echo ...x86_64
+         (cd $IOSBUILDDIR/x86_64;  $SIM_DEV_CMD ar crus libboost.a obj/$NAME/*.o; )
+-
+-        echo ...osx-i386
+-        (cd $OSXBUILDDIR/i386;  $OSX_DEV_CMD ar crus libboost.a obj/$NAME/*.o; )
+-        echo ...osx-x86_64
+-        (cd $OSXBUILDDIR/x86_64;  $OSX_DEV_CMD ar crus libboost.a obj/$NAME/*.o; )
+     done
+ }
+ 
+@@ -333,6 +297,7 @@ buildFramework()
+     mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION
+     mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Resources
+     mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Headers
++    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Headers/boost
+     mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Documentation
+ 
+     echo "Framework: Creating symlinks..."
+@@ -348,7 +313,7 @@ buildFramework()
+     $ARM_DEV_CMD lipo -create $BUILDDIR/*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
+ 
+     echo "Framework: Copying includes..."
+-    cp -r $PREFIXDIR/include/boost/*  $FRAMEWORK_BUNDLE/Headers/
++    cp -r $PREFIXDIR/include/boost/*  $FRAMEWORK_BUNDLE/Headers/boost
+ 
+     echo "Framework: Creating plist..."
+     cat > $FRAMEWORK_BUNDLE/Resources/Info.plist <<EOF
+@@ -390,12 +355,9 @@ echo "BOOST_VERSION:     $BOOST_VERSION"
+ echo "BOOST_LIBS:        $BOOST_LIBS"
+ echo "BOOST_SRC:         $BOOST_SRC"
+ echo "IOSBUILDDIR:       $IOSBUILDDIR"
+-echo "OSXBUILDDIR:       $OSXBUILDDIR"
+ echo "PREFIXDIR:         $PREFIXDIR"
+ echo "IOSFRAMEWORKDIR:   $IOSFRAMEWORKDIR"
+-echo "OSXFRAMEWORKDIR:   $OSXFRAMEWORKDIR"
+ echo "IPHONE_SDKVERSION: $IPHONE_SDKVERSION"
+-echo "OSX_SDKVERSION:    $OSX_SDKVERSION"
+ echo "XCODE_ROOT:        $XCODE_ROOT"
+ echo
+ 
+@@ -407,8 +369,6 @@ updateBoost
+ buildBoostForIPhoneOS
+ scrunchAllLibsTogetherInOneLibPerPlatform
+ buildFramework $IOSFRAMEWORKDIR $IOSBUILDDIR
+-buildFramework $OSXFRAMEWORKDIR $OSXBUILDDIR
+-
+ restoreBoost
+ 
+ echo "Completed successfully"
diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp
@@ -50,36 +50,6 @@ using namespace tests::functional::http::utilities;
 
 namespace tests { namespace functional { namespace http { namespace client {
 
-// helper function to check if failure is due to timeout.
-bool is_timeout(const std::string &msg)
-{
-    if (msg.find("The operation timed out") != std::string::npos /* WinHTTP */ ||
-        msg.find("The operation was timed out") != std::string::npos /* IXmlHttpRequest2 */)
-    {
-        return true;
-    }
-    return false;
-}
-
-template <typename Func>
-void handle_timeout(const Func &f)
-{
-    try
-    {
-        f();
-    }
-    catch (const http_exception &e)
-    {
-        if (is_timeout(e.what()))
-        {
-            // Since this test depends on an outside server sometimes it sporadically can fail due to timeouts
-            // especially on our build machines.
-            return;
-        }
-        throw;
-    }
-}
-
 SUITE(authentication_tests)
 {
 
diff --git a/Release/tests/functional/http/client/outside_tests.cpp b/Release/tests/functional/http/client/outside_tests.cpp
@@ -45,36 +45,6 @@ namespace tests { namespace functional { namespace http { namespace client {
 SUITE(outside_tests)
 {
 
-// helper function to check if failure is due to timeout.
-bool is_timeout(const std::string &msg)
-{
-    if (msg.find("The operation timed out") != std::string::npos /* WinHTTP */ ||
-        msg.find("The operation was timed out") != std::string::npos /* IXmlHttpRequest2 */)
-    {
-        return true;
-    }
-    return false;
-}
-
-template <typename Func>
-void handle_timeout(const Func &f)
-{
-    try
-    {
-        f();
-    }
-    catch (const http_exception &e)
-    {
-        if (is_timeout(e.what()))
-        {
-            // Since this test depends on an outside server sometimes it sporadically can fail due to timeouts
-            // especially on our build machines.
-            return;
-        }
-        throw;
-    }
-}
-
 TEST_FIXTURE(uri_address, outside_cnn_dot_com)
 {
     handle_timeout([]
diff --git a/Release/tests/functional/http/client/progress_handler_tests.cpp b/Release/tests/functional/http/client/progress_handler_tests.cpp
@@ -245,20 +245,20 @@ TEST_FIXTURE(uri_address, set_progress_handler_open_failure)
     const size_t repeats = 5500;
     for (size_t i = 0; i < repeats; ++i)
         data.append(U("abcdefghihklmnopqrstuvwxyz"));
-    
+
     utility::size64_t upsize = 4711u, downsize = 4711u;
     int calls = 0;
 
     http_request msg(mtd);
     // We should never see this handler called.
     msg.set_progress_handler(
-        [&](message_direction::direction direction, utility::size64_t so_far) 
-        { 
+        [&](message_direction::direction direction, utility::size64_t so_far)
+        {
             calls += 1;
-            if (direction == message_direction::upload) 
-                upsize = so_far; 
-            else 
-                downsize = so_far; 
+            if (direction == message_direction::upload)
+                upsize = so_far;
+            else
+                downsize = so_far;
         });
 
     msg.set_body(data);
@@ -406,12 +406,6 @@ TEST_FIXTURE(uri_address, data_download_exception)
     int numCalls = 0;
     msg.set_progress_handler([&](message_direction::direction, utility::size64_t)
     {
-        // TODO stgates - adding some debugging information to help with hard to reproduce
-        // sporadic failure.
-#if (defined(_MSC_VER) && (_MSC_VER >= 1800))
-        printf("In progress handler, numCalls:%i\n", numCalls);
-#endif
-
         if(++numCalls == 2)
         {
             // 2rd is for data download
@@ -421,22 +415,15 @@ TEST_FIXTURE(uri_address, data_download_exception)
 
     try
     {
-        client.request(msg).get().content_ready().get();
-    }
-    catch (http_exception const &e)
-    {
-        printf("http_exception:%s\n", e.what());
-        VERIFY_IS_TRUE(false);
+        handle_timeout([&]
+        {
+            client.request(msg).get().content_ready().get();
+        });
     }
     catch (std::invalid_argument const &)
     {
-        printf("std::invalid_argument\n");
-    }
-    catch (std::exception const &e)
-    {
-        printf("std::exception:%s\n", e.what());
+        // Expected.
     }
-    //VERIFY_THROWS(client.request(msg).get().content_ready().get(), std::invalid_argument);
 }
 
 }
diff --git a/Release/tests/functional/http/client/proxy_tests.cpp b/Release/tests/functional/http/client/proxy_tests.cpp
@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * http://www.apache.org/licenses/LICENSE-2.0
-* 
+*
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Release/tests/functional/http/client/stdafx.h b/Release/tests/functional/http/client/stdafx.h
@@ -34,3 +34,4 @@
 #include "http_test_utilities.h"
 #include "unittestpp.h"
 #include "os_utilities.h"
+#include "timeout_handler.h"
diff --git a/Release/tests/functional/http/client/timeout_handler.h b/Release/tests/functional/http/client/timeout_handler.h
