Fixed various issues on OSX from TFS integration

Author: ras0219-msft

Release/CMakeLists.txt

@@ -18,6 +18,9 @@ if(IOS)
     "${CMAKE_SOURCE_DIR}/../openssl-ios/lib/libssl.a"
     )
 
+  # The cxx_flags must be set here, because the ios-cmake toolchain file unfortunately sets "-headerpad_max_install_names" which is not a valid clang flag.
+  set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
+
   set(BUILD_SHARED_LIBS OFF)
 elseif(UNIX)
   find_package(Boost COMPONENTS system thread locale regex filesystem REQUIRED)
@@ -44,11 +47,11 @@ endif()
 if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR IOS)
   message("-- Setting clang options")
 
-  set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
-  set(OSX_SUPPRESSIONS "-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-unused-variable -Wno-unneeded-internal-declaration -Wno-return-type-c-linkage")
+  set(WARNINGS "-Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls")
+  set(OSX_SUPPRESSIONS "-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32")
   set(WARNINGS "${WARNINGS} ${OSX_SUPPRESSIONS}")
 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
 

Release/include/cpprest/xxpublic.h

@@ -75,6 +75,9 @@ typedef void * HANDLE;
 #ifdef _MS_WINDOWS
 typedef void* FILE_HANDLE;
 #else
+#ifdef __clang__
+#include <cstdio>
+#endif
 typedef FILE* FILE_HANDLE;
 #endif
 

Release/include/pplx/pplxlinux.h

@@ -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.
@@ -44,11 +44,12 @@
 #include <dispatch/dispatch.h>
 #else
 #include "compat/linux_compat.h"
+#endif
+
 #include "boost/thread/mutex.hpp"
 #include "boost/thread/condition_variable.hpp"
 #include "boost/date_time/posix_time/posix_time_types.hpp"
 #include "boost/bind/bind.hpp"
-#endif
 
 #include "pplx/pplxinterface.h"
 
@@ -92,7 +93,7 @@ namespace platform
         static const unsigned int timeout_infinite = 0xFFFFFFFF;
 
         event_impl()
-            : _signaled(false) 
+            : _signaled(false)
         {
         }
 
@@ -221,7 +222,7 @@ namespace platform
                 _M_cs.lock();
                 _M_owner = id;
                 _M_recursionCount = 1;
-            }            
+            }
         }
 
         void unlock()
@@ -235,14 +236,14 @@ namespace platform
             {
                 _M_owner = -1;
                 _M_cs.unlock();
-            }           
+            }
         }
 
     private:
 #if defined(__APPLE__)
-        std::recursive_mutex _M_cs;
+        std::mutex _M_cs;
 #else
-        boost::mutex _M_cs;
+        ::boost::mutex _M_cs;
 #endif
         long _M_recursionCount;
         volatile long _M_owner;
@@ -277,7 +278,7 @@ namespace platform
     {
     public:
         _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
-        
+
         virtual ~apple_scheduler();
     };
 #else
@@ -287,7 +288,7 @@ namespace platform
         _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
     };
 #endif
-    
+
     /// <summary>
     /// Timer
     /// </summary>
@@ -325,11 +326,11 @@ namespace extensibility
 {
     typedef ::pplx::details::event_impl event_t;
 
-#if defined(__APPLE__)
-    typedef std::mutex critical_section_t;
-#else
+//#if defined(__APPLE__)
+//    typedef std::mutex critical_section_t;
+//#else
     typedef ::boost::mutex critical_section_t;
-#endif
+//#endif
     typedef scoped_lock<critical_section_t> scoped_critical_section_t;
 
     typedef ::pplx::details::reader_writer_lock_impl reader_writer_lock_t;
@@ -348,7 +349,7 @@ namespace extensibility
 #else
     typedef details::linux_scheduler default_scheduler_t;
 #endif
-    
+
 namespace details
 {
     /// <summary>

Release/include/pplx/threadpool.h

@@ -28,7 +28,11 @@
 #include <pthread.h>
 #include <vector>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wunreachable-code"
 #include "boost/asio.hpp"
+#pragma clang diagnostic pop
 
 namespace crossplat {
 

Release/src/http/common/http_helpers.cpp

@@ -315,11 +315,7 @@ namespace details
 #ifdef _MS_WINDOWS
             sprintf_s(buffer, 9, "%8IX", bytes_read);
 #else
-# if __x86_64__
-            sprintf(buffer, "%8lX", bytes_read);
-# else
-            sprintf(buffer, "%8X", bytes_read);
-# endif
+            sprintf(buffer, "%8zX", bytes_read);
 #endif
             memcpy(&data[0], buffer, 8);
             while (data[offset] == ' ') ++offset;

Release/src/http/listener/http_linux_server.cpp

@@ -18,7 +18,10 @@
 */
 #include "stdafx.h"
 #include <boost/algorithm/string/find.hpp>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-align"
 #include <boost/regex.hpp>
+#pragma clang diagnostic pop
 #include "cpprest/http_helpers.h"
 #include "cpprest/http_server_api.h"
 #include "cpprest/http_server.h"

Release/src/streams/linux/fileio_linux.cpp

@@ -364,9 +364,9 @@ size_t _write_file_async(Concurrency::streams::details::_file_info_impl *fInfo,
 
     pplx::create_task([=]() -> void
     {
-        size_t abs_position;
+        off_t abs_position;
         bool must_restore_pos;
-        size_t orig_pos;
+        off_t orig_pos;
         if( position == (size_t)-1 )
         {
             orig_pos = lseek(fInfo->m_handle, 0, SEEK_CUR);

Release/tests/Common/TestRunner/test_runner.cpp

@@ -532,7 +532,7 @@ int main(int argc, char* argv[])
             else
             {
                 testRunner.RunTestsIf(
-                    tests, 
+                    tests,
                     [&](UnitTest::Test *pTest) -> bool
                     {
                         // Combine suite and test name
@@ -543,7 +543,7 @@ int main(int argc, char* argv[])
                         if(IsTestIgnored(pTest) && !include_ignored_tests)
                             return false;
                         else
-                            return matched_properties(pTest->m_properties) && 
+                            return matched_properties(pTest->m_properties) &&
                                 std::regex_match(fullTestName, nameRegex);
                     },
                     g_individual_test_timeout);
@@ -602,7 +602,6 @@ int main(int argc, char* argv[])
             }
         }
 
-        tests.Clear();
     }
 
     if( totalTestCount > 0 )

Release/tests/Functional/http/client/connections_and_errors.cpp

@@ -245,7 +245,7 @@ TEST_FIXTURE(uri_address, stream_timeout, "Ignore:Apple", "Bug 885080")
 
 #pragma region Cancellation tests
 
-TEST_FIXTURE(uri_address, cancel_before_request)
+TEST_FIXTURE(uri_address, cancel_before_request, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client c(m_uri);
@@ -258,9 +258,9 @@ TEST_FIXTURE(uri_address, cancel_before_request)
 
 // This test can't be implemented with our test server so isn't avaliable on WinRT.
 #ifndef __cplusplus_winrt
-TEST_FIXTURE(uri_address, cancel_after_headers, "Ignore:Linux", "NYI")
+TEST_FIXTURE(uri_address, cancel_after_headers, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
 {
-    web::http::experimental::listener::http_listener listener(m_uri);  
+    web::http::experimental::listener::http_listener listener(m_uri);
     listener.open().wait();
     http_client c(m_uri);
     pplx::cancellation_token_source source;
@@ -290,7 +290,7 @@ TEST_FIXTURE(uri_address, cancel_after_headers, "Ignore:Linux", "NYI")
 }
 #endif
 
-TEST_FIXTURE(uri_address, cancel_after_body, "Ignore:Linux", "NYI")
+TEST_FIXTURE(uri_address, cancel_after_body, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
 {
     test_http_server::scoped_server scoped(m_uri);
     test_http_server * p_server = scoped.server();
@@ -311,22 +311,22 @@ TEST_FIXTURE(uri_address, cancel_after_body, "Ignore:Linux", "NYI")
     response.content_ready().wait();
 }
 
-TEST_FIXTURE(uri_address, cancel_with_error, "Ignore:Linux", "NYI")
+TEST_FIXTURE(uri_address, cancel_with_error, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
 {
     test_http_server server(m_uri);
     VERIFY_ARE_EQUAL(0, server.open());
     http_client c(m_uri);
     pplx::cancellation_token_source source;
-       
+
     auto responseTask = c.request(methods::GET, U("/"), source.get_token());
     source.cancel();
     VERIFY_ARE_EQUAL(0, server.close());
-    
+
     // All errors after cancellation are ignored.
     VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::operation_canceled);
 }
 
-TEST_FIXTURE(uri_address, cancel_while_uploading_data)
+TEST_FIXTURE(uri_address, cancel_while_uploading_data, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client c(m_uri);
@@ -343,7 +343,7 @@ TEST_FIXTURE(uri_address, cancel_while_uploading_data)
 
 // This test can't be implemented with our test server since it doesn't stream data so isn't avaliable on WinRT.
 #ifndef __cplusplus_winrt
-TEST_FIXTURE(uri_address, cancel_while_downloading_data, "Ignore:Linux", "NYI")
+TEST_FIXTURE(uri_address, cancel_while_downloading_data, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
 {
     web::http::experimental::listener::http_listener listener(m_uri);
     listener.open().wait();

Release/tests/Functional/http/listener/connections_and_errors.cpp

@@ -144,7 +144,7 @@ TEST(default_port_admin_access, "Ignore", "Manual")
     VERIFY_THROWS(listener.open().wait(), http_exception);
 }
 
-TEST_FIXTURE(uri_address, try_port_already_in_use, "Ignore:Linux", "Bug 879077")
+TEST_FIXTURE(uri_address, try_port_already_in_use, "Ignore:Linux", "Bug 879077", "Ignore:Apple", "Bug 879077")
 {
     test_http_server::scoped_server scoped(m_uri);
     http_listener listener(m_uri);
@@ -165,7 +165,7 @@ TEST_FIXTURE(uri_address, reply_after_starting_close)
         request.reply(status_codes::OK).wait();
     });
     VERIFY_ARE_EQUAL(0, p_client->request(methods::GET, U("/path")));
-    
+
     p_client->next_response().then([](test_response *p_response)
     {
         http_asserts::assert_test_response_equals(p_response, status_codes::OK);
@@ -203,7 +203,7 @@ static void close_stream_early_with_length_impl(const uri &u, bool useException)
         return response.extract_vector();
     }).then([=](pplx::task<std::vector<unsigned char>> bodyTask)
     {
-        VERIFY_THROWS(bodyTask.get(), http_exception);    
+        VERIFY_THROWS(bodyTask.get(), http_exception);
     }).wait();
 
     listener.close().wait();