v1.9.4

Typo fix
Somehow I made that in 5ffc8a84cd without noticing
2025-09-12 16:35:40 +02:00 · 2017-05-16 13:59:29 +02:00 · 2017-05-16 13:51:17 +02:00 · 2017-05-11 13:00:03 +02:00 · 2017-05-03 21:09:27 +02:00 · 2017-05-01 19:55:17 +02:00
30 changed files with 986 additions and 166 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,25 +11,25 @@ matrix:
        apt:
          sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test']
          packages: ['clang']
-      env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++' BUILD_TYPE='Release'

    - os: linux
      compiler: clang
      addons: *clang34
-      env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0
-      
+      env: COMPILER='clang++' BUILD_TYPE='Debug'
+
    - os: linux
      compiler: clang
      addons: &clang35
        apt:
          sources: ['llvm-toolchain-precise-3.5', 'ubuntu-toolchain-r-test']
          packages: ['clang-3.5']
-      env: COMPILER='clang++-3.5' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++-3.5' BUILD_TYPE='Release'

    - os: linux
      compiler: clang
      addons: *clang35
-      env: COMPILER='clang++-3.5' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='clang++-3.5' BUILD_TYPE='Debug'


    - os: linux
@@ -38,12 +38,12 @@ matrix:
        apt:
          sources: ['llvm-toolchain-precise-3.6', 'ubuntu-toolchain-r-test']
          packages: ['clang-3.6']
-      env: COMPILER='clang++-3.6' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++-3.6' BUILD_TYPE='Release'

    - os: linux
      compiler: clang
      addons: *clang36
-      env: COMPILER='clang++-3.6' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='clang++-3.6' BUILD_TYPE='Debug'


    - os: linux
@@ -52,12 +52,12 @@ matrix:
        apt:
          sources: ['llvm-toolchain-precise-3.7', 'ubuntu-toolchain-r-test']
          packages: ['clang-3.7']
-      env: COMPILER='clang++-3.7' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++-3.7' BUILD_TYPE='Release'

    - os: linux
      compiler: clang
      addons: *clang37
-      env: COMPILER='clang++-3.7' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='clang++-3.7' BUILD_TYPE='Debug'


    - os: linux
@@ -66,12 +66,12 @@ matrix:
        apt:
          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
          packages: ['clang-3.8']
-      env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++-3.8' BUILD_TYPE='Release'

    - os: linux
      compiler: clang
      addons: *clang38
-      env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='clang++-3.8' BUILD_TYPE='Debug'


    # 2/ Linux GCC Builds
@@ -81,12 +81,12 @@ matrix:
        apt:
         sources: ['ubuntu-toolchain-r-test']
         packages: ['g++-4.4']
-      env: COMPILER='g++-4.4' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='g++-4.4' BUILD_TYPE='Release'

    - os: linux
      compiler: gcc
      addons: *gcc44
-      env: COMPILER='g++-4.4' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='g++-4.4' BUILD_TYPE='Debug'


    - os: linux
@@ -95,12 +95,12 @@ matrix:
        apt:
         sources: ['ubuntu-toolchain-r-test']
         packages: ['g++-4.7']
-      env: COMPILER='g++-4.7' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='g++-4.7' BUILD_TYPE='Release'

    - os: linux
      compiler: gcc
      addons: *gcc47
-      env: COMPILER='g++-4.7' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='g++-4.7' BUILD_TYPE='Debug'


    - os: linux
@@ -109,12 +109,12 @@ matrix:
        apt:
         sources: ['ubuntu-toolchain-r-test']
         packages: ['g++-4.8']
-      env: COMPILER='g++-4.8' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='g++-4.8' BUILD_TYPE='Release'

    - os: linux
      compiler: gcc
      addons: *gcc48
-      env: COMPILER='g++-4.8' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='g++-4.8' BUILD_TYPE='Debug'


    - os: linux
@@ -123,12 +123,12 @@ matrix:
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-4.9']
-      env: COMPILER='g++-4.9' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='g++-4.9' BUILD_TYPE='Release'

    - os: linux
      compiler: gcc
      addons: *gcc49
-      env: COMPILER='g++-4.9' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='g++-4.9' BUILD_TYPE='Debug'


    - os: linux
@@ -137,12 +137,12 @@ matrix:
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-5']
-      env: COMPILER='g++-5' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='g++-5' BUILD_TYPE='Release'

    - os: linux
      compiler: gcc
      addons: *gcc5
-      env: COMPILER='g++-5' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='g++-5' BUILD_TYPE='Debug'


    - os: linux
@@ -151,20 +151,17 @@ matrix:
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-6']
-      env: COMPILER='g++-6' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='g++-6' BUILD_TYPE='Release'

    - os: linux
      compiler: gcc
      addons: *gcc6
-      env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='g++-6' BUILD_TYPE='Debug'

    # 3a/ Linux C++11 GCC builds
    - os: linux
      compiler: gcc
-      addons: &gcc48
-        apt:
-         sources: ['ubuntu-toolchain-r-test']
-         packages: ['g++-4.8']
+      addons: *gcc48
      env: COMPILER='g++-4.8' BUILD_TYPE='Release' CPP11=1

    - os: linux
@@ -175,10 +172,7 @@ matrix:
    # 3b/ Linux C++11 Clang builds
    - os: linux
      compiler: clang
-      addons: &clang38
-        apt:
-          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8']
+      addons: *clang38
      env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=1

    - os: linux
@@ -186,27 +180,69 @@ matrix:
      addons: *clang38
      env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP11=1

+    # 4a/ Linux C++14 GCC builds
+    - os: linux
+      compiler: gcc
+      addons: *gcc6
+      env: COMPILER='g++-6' BUILD_TYPE='Release' CPP14=1

-    # 4/ OSX Clang Builds
+    - os: linux
+      compiler: gcc
+      addons: *gcc6
+      env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP14=1
+
+    # 4b/ Linux C++14 Clang builds
+    - os: linux
+      compiler: clang
+      addons: *clang38
+      env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1
+
+    - os: linux
+      compiler: clang
+      addons: *clang38
+      env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP14=1
+
+
+    # 5/ OSX Clang Builds
    - os: osx
      osx_image: xcode7.3
      compiler: clang
-      env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='clang++' BUILD_TYPE='Debug'

    - os: osx
      osx_image: xcode7.3
      compiler: clang
-      env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++' BUILD_TYPE='Release'

    - os: osx
      osx_image: xcode8
      compiler: clang
-      env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0
+      env: COMPILER='clang++' BUILD_TYPE='Debug'

    - os: osx
      osx_image: xcode8
      compiler: clang
-      env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0
+      env: COMPILER='clang++' BUILD_TYPE='Release'
+
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+      env: COMPILER='clang++' BUILD_TYPE='Debug' USE_CPP11=1
+
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+      env: COMPILER='clang++' BUILD_TYPE='Release' USE_CPP11=1
+
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+      env: COMPILER='clang++' BUILD_TYPE='Debug' USE_CPP14=1
+
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+      env: COMPILER='clang++' BUILD_TYPE='Release' USE_CPP14=1


 install:
@@ -218,13 +254,13 @@ install:
      mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
    elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      which cmake || brew install cmake 
+      which cmake || brew install cmake
    fi

 before_script:
  - export CXX=${COMPILER}
  - cd ${TRAVIS_BUILD_DIR}
-  - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Wdev -DUSE_CPP11=${CPP11}
+  - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Wdev -DUSE_CPP11=${CPP11} -DUSE_CPP14=${CPP14}
  - cd Build

 script:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,10 @@ elseif(USE_CPP14)
    set(CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
 endif()

+if(USE_WMAIN)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wmainCRTStartup")
+endif()
+
 #checks that the given hard-coded list contains all headers + sources in the given folder
 function(CheckFileList LIST_VAR FOLDER)
  set(MESSAGE " should be added to the variable ${LIST_VAR}")
@@ -245,28 +249,35 @@ SOURCE_GROUP("Benchmarks" FILES ${BENCH_SOURCES})

 # configure the executable
 include_directories(${HEADER_DIR})
-add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${HEADERS})
-add_executable(Benchmark ${BENCH_SOURCES} ${HEADERS})

-# Add desired warnings
-if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
-    target_compile_options( SelfTest PRIVATE -Wall -Wextra )
-    target_compile_options( Benchmark PRIVATE -Wall -Wextra )
-endif()
-if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
-    target_compile_options( SelfTest PRIVATE /W4 /w44265 /WX )
-    target_compile_options( Benchmark PRIVATE /W4 )
-endif()
+# Projects consuming Catch via ExternalProject_Add might want to use install step
+# without building all of our selftests.
+if (NOT NO_SELFTEST)
+    add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${HEADERS})
+    add_executable(Benchmark ${BENCH_SOURCES} ${HEADERS})
+
+    # Add desired warnings
+    if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
+        target_compile_options( SelfTest PRIVATE -Wall -Wextra )
+        target_compile_options( Benchmark PRIVATE -Wall -Wextra )
+    endif()
+    if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
+        target_compile_options( SelfTest PRIVATE /W4 /w44265 /WX )
+        target_compile_options( Benchmark PRIVATE /W4 )
+    endif()


-# configure unit tests via CTest
-enable_testing()
-add_test(NAME RunTests COMMAND SelfTest)
+    # configure unit tests via CTest
+    enable_testing()
+    add_test(NAME RunTests COMMAND SelfTest)

-add_test(NAME ListTests COMMAND SelfTest --list-tests)
-set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases")
+    add_test(NAME ListTests COMMAND SelfTest --list-tests)
+    set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases")
+
+    add_test(NAME ListTags COMMAND SelfTest --list-tags)
+    set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags")
+
+endif() # !NO_SELFTEST

-add_test(NAME ListTags COMMAND SelfTest --list-tags)
-set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags")

 install(DIRECTORY "single_include/" DESTINATION "include/catch")
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=master)](https://travis-ci.org/philsquared/Catch)
 [![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/master?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/master)

-<a href="https://github.com/philsquared/Catch/releases/download/v1.9.0/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>
+<a href="https://github.com/philsquared/Catch/releases/download/v1.9.4/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>

 ## What's the Catch?

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,15 +1,30 @@
 # version string format -- This will be overwritten later anyway
 version: "{build}"

-# Disable the dead branch for v2 development
-branches:
-    except:
-        - develop-v2
-
 os:
-  - Visual Studio 2013
-  - Visual Studio 2015
  - Visual Studio 2017
+  - Visual Studio 2015
+  - Visual Studio 2013
+
+environment:
+    matrix:
+        - additional_flags: "/permissive- /std:c++latest"
+          wmain: 0
+
+        - additional_flags: ""
+          wmain: 0
+
+        - additional_flags: "/D_UNICODE /DUNICODE"
+          wmain: 1
+
+matrix:
+    exclude:
+        -
+            additional_flags: "/permissive- /std:c++latest"
+            os: Visual Studio 2015
+        -
+            additional_flags: "/permissive- /std:c++latest"
+            os: Visual Studio 2013

 init:
  - git config --global core.autocrlf input
@@ -32,8 +47,8 @@ configuration:

 #Cmake will autodetect the compiler, but we set the arch
 before_build:
-  - echo Running cmake...
-  - cmake -H. -BBuild -A%PLATFORM%
+  - set CXXFLAGS=%additional_flags%
+  - cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain%

 # build with MSBuild
 build:
--- a/contrib/ParseAndAddCatchTests.cmake
+++ b/contrib/ParseAndAddCatchTests.cmake
@@ -0,0 +1,115 @@
+#==================================================================================================#
+#  supported macros                                                                                #
+#    - TEST_CASE,                                                                                  #
+#    - SCENARIO,                                                                                   #
+#    - TEST_CASE_METHOD,                                                                           #
+#    - CATCH_TEST_CASE,                                                                            #
+#    - CATCH_SCENARIO,                                                                             #
+#    - CATCH_TEST_CASE_METHOD.                                                                     #
+#                                                                                                  #
+#  Usage                                                                                           #
+# 1. make sure this module is in the path or add this otherwise:                                   #
+#    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake.modules/")              #
+# 2. make sure that you've enabled testing option for the project by the call:                     #
+#    enable_testing()                                                                              #
+# 3. add the lines to the script for testing target (sample CMakeLists.txt):                       #
+#        project(testing_target)                                                                   #
+#        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake.modules/")          #
+#        enable_testing()                                                                          #
+#                                                                                                  #
+#        find_path(CATCH_INCLUDE_DIR "catch.hpp")                                                  #
+#        include_directories(${INCLUDE_DIRECTORIES} ${CATCH_INCLUDE_DIR})                          #
+#                                                                                                  #
+#        file(GLOB SOURCE_FILES "*.cpp")                                                           #
+#        add_executable(${PROJECT_NAME} ${SOURCE_FILES})                                           #
+#                                                                                                  #
+#        include(ParseAndAddCatchTests)                                                            #
+#        ParseAndAddCatchTests(${PROJECT_NAME})                                                    #
+#==================================================================================================#
+
+cmake_minimum_required(VERSION 2.8.8)
+
+# This removes the contents between
+#  - block comments (i.e. /* ... */) 
+#  - full line comments (i.e. // ... ) 
+# contents have been read into '${CppCode}'.
+# !keep partial line comments
+function(RemoveComments CppCode)
+  string(ASCII 2 CMakeBeginBlockComment)
+  string(ASCII 3 CMakeEndBlockComment)
+  string(REGEX REPLACE "/\\*" "${CMakeBeginBlockComment}" ${CppCode} "${${CppCode}}")
+  string(REGEX REPLACE "\\*/" "${CMakeEndBlockComment}" ${CppCode} "${${CppCode}}")
+  string(REGEX REPLACE "${CMakeBeginBlockComment}[^${CMakeEndBlockComment}]*${CMakeEndBlockComment}" "" ${CppCode} "${${CppCode}}")
+  string(REGEX REPLACE "\n[ \t]*//+[^\n]+" "\n" ${CppCode} "${${CppCode}}")
+
+  set(${CppCode} "${${CppCode}}" PARENT_SCOPE)
+endfunction()
+
+# Worker function
+function(ParseFile SourceFile TestTarget)
+    if(NOT EXISTS ${SourceFile})
+        message(WARNING "Cannot find source file: ${SourceFile}")
+        return()
+    endif()
+    file(STRINGS ${SourceFile} Contents NEWLINE_CONSUME)
+
+    # Remove block and fullline comments
+    RemoveComments(Contents)
+
+    # Find definition of test names
+    string(REGEX MATCHALL "[ \t]*(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([^\)]+\\)+[ \t\n]*{+[ \t]*(//[^\n]*[Tt][Ii][Mm][Ee][Oo][Uu][Tt][ \t]*[0-9]+)*" Tests "${Contents}")
+
+    foreach(TestName ${Tests})
+        # Strip newlines
+        string(REGEX REPLACE "\\\\\n|\n" "" TestName "${TestName}")
+
+        # Get test type and fixture if applicable
+        string(REGEX MATCH "(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([^,^\"]*" TestTypeAndFixture "${TestName}")
+        string(REGEX MATCH "(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)" TestType "${TestTypeAndFixture}")
+        string(REPLACE "${TestType}(" "" TestFixture "${TestTypeAndFixture}")
+
+        # Get string parts of test definition
+        string(REGEX MATCHALL "\"+([^\\^\"]|\\\\\")+\"+" TestStrings "${TestName}")
+
+        # Strip wrapping quotation marks
+        string(REGEX REPLACE "^\"(.*)\"$" "\\1" TestStrings "${TestStrings}")
+        string(REPLACE "\";\"" ";" TestStrings "${TestStrings}")
+
+        # Validate that a test name and tags have been provided
+        list(LENGTH TestStrings TestStringsLength)
+        if(TestStringsLength GREATER 2 OR TestStringsLength LESS 1)
+            message(FATAL_ERROR "You must provide a valid test name and tags for all tests in ${SourceFile}")
+        endif()
+
+        # Assign name and tags
+        list(GET TestStrings 0 Name)
+        if("${TestType}" STREQUAL "SCENARIO")
+            set(Name "Scenario: ${Name}")
+        endif()
+        if(TestFixture)
+            set(CTestName "${TestFixture}:${Name}")
+        else()
+            set(CTestName "${Name}")
+        endif()
+        if(TestStringsLength EQUAL 2)
+            list(GET TestStrings 1 Tags)
+            string(TOLOWER "${Tags}" Tags)
+            string(REPLACE "]" ";" Tags "${Tags}")
+            string(REPLACE "[" "" Tags "${Tags}")
+        endif()
+
+        # Add the test and set its properties
+        add_test(NAME "\"${CTestName}\"" COMMAND ${TestTarget} ${Name} ${AdditionalCatchParameters})
+        set_tests_properties("\"${CTestName}\"" PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran"
+                                                LABELS "${Tags}")
+
+    endforeach()
+endfunction()
+
+# entry point
+function(ParseAndAddCatchTests TestTarget)
+    get_target_property(SourceFiles ${TestTarget} SOURCES)
+    foreach(SourceFile ${SourceFiles})
+        ParseFile(${SourceFile} ${TestTarget})
+    endforeach()
+endfunction()
--- a/docs/assertions.md
+++ b/docs/assertions.md
@@ -131,6 +131,11 @@ To support Matchers a slightly different form is used. Matchers have [their own

 Matchers can be composed using `&&`, `||` and `!` operators.

+## Thread Safety
+
+Currently assertions in Catch are not thread safe.
+For more details, along with workarounds, see the section on [the limitations page](limitations.md#thread-safe-assertions).
+
 ---

 [Home](Readme.md)
--- a/docs/build-systems.md
+++ b/docs/build-systems.md
@@ -56,8 +56,26 @@ Because of the incremental nature of Catch's test suites and ability to run spec

 ## CMake

-You can use the following CMake script to automatically fetch Catch from github and configure it as an external project:
+In general we recommend "vendoring" Catch's single-include releases inside your own repository. If you do this, the following example shows a minimal CMake project:
+```CMake
+cmake_minimum_required(VERSION 3.0)

+project(cmake_test)
+
+# Prepare "Catch" library for other executables
+set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/catch)
+add_library(Catch INTERFACE)
+target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
+
+# Make test executable
+set(TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
+add_executable(tests ${TEST_SOURCES})
+target_link_libraries(tests Catch)
+```
+Note that it assumes that the path to the Catch's header is `catch/catch.hpp` from the `CMakeLists.txt` file.
+
+
+You can also use the following CMake snippet to automatically fetch the entire Catch repository from github and configure it as an external project:
 ```CMake
 cmake_minimum_required(VERSION 2.8.8)
 project(catch_builder CXX)
@@ -90,6 +108,32 @@ include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
 enable_testing(true)  # Enables unit-testing.
 ```

+The advantage of this approach is that you can always automatically update Catch to the latest release. The disadvantage is that it means bringing in lot more than you need.
+
+
+### Automatic test registration
+If you are also using ctest, `contrib/ParseAndAddCatchTests.cmake` is a CMake script that attempts to parse your test files and automatically register all test cases, using tags as labels. This means that these
+```cpp
+TEST_CASE("Test1", "[unit]") {
+    int a = 1;
+    int b = 2;
+    REQUIRE(a == b);
+}
+
+TEST_CASE("Test2") {
+    int a = 1;
+    int b = 2;
+    REQUIRE(a == b);
+}
+
+TEST_CASE("Test3", "[a][b][c]") {
+    int a = 1;
+    int b = 2;
+    REQUIRE(a == b);
+}
+```
+would be registered as 3 tests, `Test1`, `Test2` and `Test3`, and ctest 4 labels would be created, `a`, `b`, `c` and `unit`.
+
 ---

 [Home](Readme.md)
--- a/docs/opensource-users.md
+++ b/docs/opensource-users.md
@@ -1,6 +1,6 @@
 # Open Source projects using Catch

-Catch is great for open source. With it's [liberal license](../LICENSE_1_0.txt) and single-header, dependency-free, distribution 
+Catch is great for open source. With it's [liberal license](../LICENSE.txt) and single-header, dependency-free, distribution 
 it's easy to just drop the header into your project and start writing tests - what's not to like?

 As a result Catch is now being used in many Open Source projects, including some quite well known ones.
@@ -37,6 +37,9 @@ a small and easy to use C++11 library that adds a functionality set that will be
 ### [nanodbc](https://github.com/lexicalunit/nanodbc/)
 A small C++ library wrapper for the native C ODBC API.

+### [Nonius](https://github.com/libnonius/nonius)
+A header-only framework for benchmarking small snippets of C++ code.
+
 ### [SOCI](https://github.com/SOCI/soci)
 The C++ Database Access Library

@@ -60,6 +63,9 @@ ArangoDB is a native multi-model database with flexible data models for document
 ### [MAME](https://github.com/mamedev/mame)
 MAME originally stood for Multiple Arcade Machine Emulator

+### [Newsbeuter](https://github.com/akrennmair/newsbeuter)
+Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
+
 ### [Standardese](https://github.com/foonathan/standardese)
 Standardese aims to be a nextgen Doxygen

--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,3 +1,45 @@
+# 1.9.4
+
+### Fixes
+* `CATCH_FAIL` macro no longer causes compilation error without variadic macro support
+* `INFO` messages are no longer cleared after being reported once
+
+### Improvements and minor changes
+* Catch now uses `wmain` when compiled under Windows and `UNICODE` is defined.
+  * Note that Catch still officially supports only ASCII
+
+# 1.9.3
+
+### Fixes
+* Completed the fix for (lack of) uint64_t in earlier Visual Studios
+
+# 1.9.2
+
+### Improvements and minor changes
+* All of `Approx`'s member functions now accept strong typedefs in C++11 mode (#888)
+  * Previously `Approx::scale`, `Approx::epsilon`, `Approx::margin` and `Approx::operator()` didn't.
+
+
+### Fixes
+* POSIX signals are now disabled by default under QNX (#889)
+  * QNX does not support current enough (2001) POSIX specification
+* JUnit no longer counts exceptions as failures if given test case is marked as ok to fail.
+* `Catch::Option` should now have its storage properly aligned.
+* Catch no longer attempts to define `uint64_t` on windows (#862)
+  * This was causing trouble when compiled under Cygwin
+
+### Other
+* Catch is now compiled under MSVC 2017 using `std:c++latest` (C++17 mode) in CI
+* We now provide cmake script that autoregisters Catch tests into ctest.
+  * See `contrib` folder.
+
+
+# 1.9.1
+
+### Fixes
+* Unexpected exceptions are no longer ignored by default (#885, #887)
+
+
 # 1.9.0


--- a/docs/tostring.md
+++ b/docs/tostring.md
@@ -16,16 +16,7 @@ std::ostream& operator << ( std::ostream& os, T const& value ) {

 (where ```T``` is your type and ```convertMyTypeToString``` is where you'll write whatever code is necessary to make your type printable - it doesn't have to be in another function).

-You should put this function in the same namespace as your type.
-
-Alternatively you may prefer to write it as a member function:
-
-```
-std::ostream& T::operator << ( std::ostream& os ) const {
-	os << convertMyTypeToString( *this );
-	return os;
-}
-```
+You should put this function in the same namespace as your type and it has to be declared before including Catch's header.

 ## Catch::toString overload

@@ -39,11 +30,12 @@ namespace Catch {
 }
 ```

-Again ```T``` is your type and ```convertMyTypeToString``` is where you'll write whatever code is necessary to make your type printable. Note that the function must be in the Catch namespace, which itself must be in the global namespace.
+Again ```T``` is your type and ```convertMyTypeToString``` is where you'll write whatever code is necessary to make your type printable. Note that the function must be in the Catch namespace, which itself must be in the global namespace and must be declared _before_ Catch's header is included.
+
+**Please note that overloading `Catch::toString` is currently considered legacy and will not be supported in the next major version of Catch.**

 ## Catch::StringMaker<T> specialisation
-
-There are some cases where overloading toString does not work as expected. Specialising StringMaker<T> gives you more precise, and reliable, control - but at the cost of slightly more code and complexity:
+Another way of telling Catch how to convert a type to string is specialising `Catch::StringMaker` template. This allows you to have separate way of stringifying types for Catch, than you have for writing it to a stream and also doesn't require you to declare it before including Catch's header.

 ```
 namespace Catch {
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -136,7 +136,7 @@ LeakDetector leakDetector;
    #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
    #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
    #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-    #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ )
+    #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
    #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
    #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
 #else
--- a/include/catch_session.hpp
+++ b/include/catch_session.hpp
@@ -166,6 +166,32 @@ namespace Catch {
            return returnCode;
        }

+    #if defined(WIN32) && defined(UNICODE)
+        int run( int argc, wchar_t const* const* const argv ) {
+
+            char **utf8Argv = new char *[ argc ];
+
+            for ( int i = 0; i < argc; ++i ) {
+                int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+
+                utf8Argv[ i ] = new char[ bufSize ];
+
+                WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+            }
+
+            int returnCode = applyCommandLine( argc, utf8Argv );
+            if( returnCode == 0 )
+                returnCode = run();
+
+            for ( int i = 0; i < argc; ++i )
+                delete [] utf8Argv[ i ];
+
+            delete [] utf8Argv;
+
+            return returnCode;
+        }
+    #endif
+
        int run() {
            if( m_configData.showHelp )
                return 0;
--- a/include/internal/catch_approx.hpp
+++ b/include/internal/catch_approx.hpp
@@ -40,16 +40,17 @@ namespace Detail {
            return Approx( 0 );
        }

-        Approx operator()( double value ) {
-            Approx approx( value );
+#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS)
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T value ) {
+            Approx approx( static_cast<double>(value) );
            approx.epsilon( m_epsilon );
            approx.margin( m_margin );
            approx.scale( m_scale );
            return approx;
        }

-#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS)
-
        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
        explicit Approx( T value ): Approx(static_cast<double>(value))
        {}
@@ -100,7 +101,36 @@ namespace Detail {
        friend bool operator >= ( Approx const& lhs, T rhs ) {
            return lhs.m_value > double(rhs) || lhs == rhs;
        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T newEpsilon ) {
+            m_epsilon = double(newEpsilon);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T newMargin ) {
+            m_margin = double(newMargin);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T newScale ) {
+            m_scale = double(newScale);
+            return *this;
+        }
+
 #else
+
+        Approx operator()( double value ) {
+            Approx approx( value );
+            approx.epsilon( m_epsilon );
+            approx.margin( m_margin );
+            approx.scale( m_scale );
+            return approx;
+        }
+
+
        friend bool operator == ( double lhs, Approx const& rhs ) {
            // Thanks to Richard Harris for his help refining this formula
            bool relativeOK = std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) );
@@ -137,7 +167,6 @@ namespace Detail {
        friend bool operator >= ( Approx const& lhs, double rhs ) {
            return lhs.m_value > rhs || lhs == rhs;
        }
-#endif

        Approx& epsilon( double newEpsilon ) {
            m_epsilon = newEpsilon;
@@ -153,6 +182,7 @@ namespace Detail {
            m_scale = newScale;
            return *this;
        }
+#endif

        std::string toString() const {
            std::ostringstream oss;
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -152,7 +152,7 @@
            INTERNAL_CATCH_REACT( __catchResult ) \
        } while( Catch::alwaysFalse() )
 #else
-    #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \
+    #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, log ) \
        do { \
            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
            __catchResult << log + ::Catch::StreamEndStop(); \
--- a/include/internal/catch_compiler_capabilities.h
+++ b/include/internal/catch_compiler_capabilities.h
@@ -80,13 +80,20 @@


 ////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__)

 #   if !defined(CATCH_CONFIG_POSIX_SIGNALS)
 #       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
 #   endif

+#endif
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
 // Required for some versions of Cygwin to declare gettimeofday
 // see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
 #   define _BSD_SOURCE
--- a/include/internal/catch_default_main.hpp
+++ b/include/internal/catch_default_main.hpp
@@ -10,8 +10,14 @@

 #ifndef __OBJC__

+#if defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
 // Standard C/C++ main entry point
 int main (int argc, char * argv[]) {
+#endif
+
 	int result = Catch::Session().run( argc, argv );
    return ( result < 0xff ? result : 0xff );
 }
--- a/include/internal/catch_option.hpp
+++ b/include/internal/catch_option.hpp
@@ -66,8 +66,18 @@ namespace Catch {
        }

    private:
-        T* nullableValue;
-        char storage[sizeof(T)];
+        T *nullableValue;
+        union {
+            char storage[sizeof(T)];
+    
+            // These are here to force alignment for the storage
+            long double dummy1;
+            void (*dummy2)();
+            long double dummy3;
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+            long long dummy4;
+#endif
+        };
    };

 } // end namespace Catch
--- a/include/internal/catch_run_context.hpp
+++ b/include/internal/catch_run_context.hpp
@@ -145,8 +145,9 @@ namespace Catch {
                m_totals.assertions.failed++;
            }

-            if( m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) ) )
-                m_messages.clear();
+            // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+            // and should be let to clear themselves out.
+            static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));

            // Reset working state
            m_lastAssertionInfo = AssertionInfo( std::string(), m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition );
@@ -301,11 +302,9 @@ namespace Catch {
            catch(...) {
                // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions 
                // are reported without translation at the point of origin.
-#ifdef CATCH_CONFIG_FAST_COMPILE
                if (m_shouldReportUnexpected) {
                    makeUnexpectedResultBuilder().useActiveException();
                }
-#endif
            }
            m_testCaseTracker->close();
            handleUnfinishedSections();
--- a/include/internal/catch_timer.h
+++ b/include/internal/catch_timer.h
@@ -10,14 +10,20 @@

 #include "catch_platform.h"

-#ifdef CATCH_PLATFORM_WINDOWS
-typedef unsigned long long uint64_t;
-#else
-#include <stdint.h>
-#endif
+#ifdef _MSC_VER

 namespace Catch {
+    typedef unsigned long long UInt64;
+}
+#else
+#include <stdint.h>
+namespace Catch {
+    typedef uint64_t UInt64;
+}
+#endif

+
+namespace Catch {
    class Timer {
    public:
        Timer() : m_ticks( 0 ) {}
@@ -27,7 +33,7 @@ namespace Catch {
        double getElapsedSeconds() const;

    private:
-        uint64_t m_ticks;
+        UInt64 m_ticks;
    };

 } // namespace Catch
--- a/include/internal/catch_timer.hpp
+++ b/include/internal/catch_timer.hpp
@@ -28,21 +28,21 @@ namespace Catch {

    namespace {
 #ifdef CATCH_PLATFORM_WINDOWS
-        uint64_t getCurrentTicks() {
-            static uint64_t hz=0, hzo=0;
+        UInt64 getCurrentTicks() {
+            static UInt64 hz=0, hzo=0;
            if (!hz) {
                QueryPerformanceFrequency( reinterpret_cast<LARGE_INTEGER*>( &hz ) );
                QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
            }
-            uint64_t t;
+            UInt64 t;
            QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
            return ((t-hzo)*1000000)/hz;
        }
 #else
-        uint64_t getCurrentTicks() {
+        UInt64 getCurrentTicks() {
            timeval t;
            gettimeofday(&t,CATCH_NULL);
-            return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
+            return static_cast<UInt64>( t.tv_sec ) * 1000000ull + static_cast<UInt64>( t.tv_usec );
        }
 #endif
    }
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -38,7 +38,7 @@ namespace Catch {
    }

    inline Version libraryVersion() {
-        static Version version( 1, 9, 0, "", 0 );
+        static Version version( 1, 9, 4, "", 0 );
        return version;
    }

--- a/include/reporters/catch_reporter_junit.hpp
+++ b/include/reporters/catch_reporter_junit.hpp
@@ -51,7 +51,8 @@ namespace Catch {
    public:
        JunitReporter( ReporterConfig const& _config )
        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
+            xml( _config.stream() ),
+            m_okToFail( false )
        {
            m_reporterPrefs.shouldRedirectStdOut = true;
        }
@@ -77,8 +78,11 @@ namespace Catch {
            CumulativeReporterBase::testGroupStarting( groupInfo );
        }

+        virtual void testCaseStarting( TestCaseInfo const& testCaseInfo ) CATCH_OVERRIDE {
+            m_okToFail = testCaseInfo.okToFail();
+        }
        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-            if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException )
+            if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
                unexpectedExceptions++;
            return CumulativeReporterBase::assertionEnded( assertionStats );
        }
@@ -243,6 +247,7 @@ namespace Catch {
        std::ostringstream stdOutForSuite;
        std::ostringstream stdErrForSuite;
        unsigned int unexpectedExceptions;
+        bool m_okToFail;
    };

    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -3,6 +3,18 @@
 <exe-name> is a <version> host application.
 Run with -? for options

+-------------------------------------------------------------------------------
+#748 - captures with unexpected exceptions
+  outside assertions
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with messages:
+  answer := 42
+  expected exception
+
 -------------------------------------------------------------------------------
 #748 - captures with unexpected exceptions
  inside REQUIRE_NOTHROW
@@ -115,6 +127,17 @@ TrickyTests.cpp:<line number>: FAILED:
 with expansion:
  {?} == {?}

+-------------------------------------------------------------------------------
+An unchecked exception reports the line of the last assertion
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  unexpected exception
+
 -------------------------------------------------------------------------------
 Contains string matcher
 -------------------------------------------------------------------------------
@@ -148,6 +171,16 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
  custom exception - not std

+-------------------------------------------------------------------------------
+Custom std-exceptions can be custom translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom std exception
+
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
@@ -335,7 +368,9 @@ MessageTests.cpp:<line number>: FAILED:
  CHECK( a == 0 )
 with expansion:
  2 == 0
-with message:
+with messages:
+  this message may be logged later
+  this message should be logged
  and this, but later

 -------------------------------------------------------------------------------
@@ -413,6 +448,16 @@ MiscTests.cpp:<line number>:
 warning:
  This one ran

+-------------------------------------------------------------------------------
+Non-std exceptions can be translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom exception
+
 -------------------------------------------------------------------------------
 Ordering comparison checks that should fail
 -------------------------------------------------------------------------------
@@ -599,6 +644,16 @@ with expansion:
  }
  "

+-------------------------------------------------------------------------------
+Unexpected exceptions can be translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  3.14
+
 -------------------------------------------------------------------------------
 Vector matchers that fail
  Contains (element)
@@ -660,6 +715,16 @@ MatchersTests.cpp:<line number>: FAILED:
 with expansion:
  { 1, 2, 3 } Equals: {  }

+-------------------------------------------------------------------------------
+When unchecked exceptions are thrown directly they are always failures
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown during a CHECK the test should continue
 -------------------------------------------------------------------------------
@@ -694,6 +759,17 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
  expected exception

+-------------------------------------------------------------------------------
+When unchecked exceptions are thrown from sections they are always failures
+  section name
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
@@ -866,6 +942,6 @@ with expansion:
  "first" == "second"

 ===============================================================================
-test cases: 167 | 125 passed | 38 failed |  4 failed as expected
-assertions: 960 | 859 passed | 81 failed | 20 failed as expected
+test cases: 167 | 119 passed | 44 failed |  4 failed as expected
+assertions: 967 | 859 passed | 87 failed | 21 failed as expected

--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -14,6 +14,18 @@ PASSED:
 with message:
  yay

+-------------------------------------------------------------------------------
+#748 - captures with unexpected exceptions
+  outside assertions
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with messages:
+  answer := 42
+  expected exception
+
 -------------------------------------------------------------------------------
 #748 - captures with unexpected exceptions
  inside REQUIRE_NOTHROW
@@ -107,7 +119,7 @@ with expansion:

 MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( (*__error()) == 1 )
+  REQUIRE( errno == 1 )
 with expansion:
  1 == 1

@@ -444,6 +456,11 @@ ExceptionTests.cpp:<line number>:
 PASSED:
  CHECK( 1 == 1 )

+ExceptionTests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  unexpected exception
+
 -------------------------------------------------------------------------------
 Anonymous test case 1
 -------------------------------------------------------------------------------
@@ -998,6 +1015,16 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
  custom exception - not std

+-------------------------------------------------------------------------------
+Custom std-exceptions can be custom translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom std exception
+
 -------------------------------------------------------------------------------
 Demonstrate that a non-const == is not used
 -------------------------------------------------------------------------------
@@ -2690,14 +2717,17 @@ MessageTests.cpp:<line number>: FAILED:
  CHECK( a == 1 )
 with expansion:
  2 == 1
-with message:
+with messages:
+  this message may be logged later
  this message should be logged

 MessageTests.cpp:<line number>: FAILED:
  CHECK( a == 0 )
 with expansion:
  2 == 0
-with message:
+with messages:
+  this message may be logged later
+  this message should be logged
  and this, but later

 MessageTests.cpp:<line number>:
@@ -2705,7 +2735,10 @@ PASSED:
  CHECK( a == 2 )
 with expansion:
  2 == 2
-with message:
+with messages:
+  this message may be logged later
+  this message should be logged
+  and this, but later
  but not this

 -------------------------------------------------------------------------------
@@ -4508,6 +4541,16 @@ MiscTests.cpp:<line number>:
 warning:
  This one ran

+-------------------------------------------------------------------------------
+Non-std exceptions can be translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom exception
+
 -------------------------------------------------------------------------------
 NotImplemented exception
 -------------------------------------------------------------------------------
@@ -7945,6 +7988,16 @@ PASSED:
 with expansion:
  true

+-------------------------------------------------------------------------------
+Unexpected exceptions can be translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  3.14
+
 -------------------------------------------------------------------------------
 Use a custom approx
 -------------------------------------------------------------------------------
@@ -8165,6 +8218,16 @@ ExceptionTests.cpp:<line number>:
 PASSED:
  REQUIRE_THROWS( thisThrows() )

+-------------------------------------------------------------------------------
+When unchecked exceptions are thrown directly they are always failures
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown during a CHECK the test should continue
 -------------------------------------------------------------------------------
@@ -8199,6 +8262,17 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
  expected exception

+-------------------------------------------------------------------------------
+When unchecked exceptions are thrown from sections they are always failures
+  section name
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
@@ -9398,6 +9472,6 @@ MiscTests.cpp:<line number>:
 PASSED:

 ===============================================================================
-test cases: 167 | 124 passed | 39 failed |  4 failed as expected
-assertions: 962 | 859 passed | 83 failed | 20 failed as expected
+test cases: 167 | 118 passed | 45 failed |  4 failed as expected
+assertions: 969 | 859 passed | 89 failed | 21 failed as expected

--- a/projects/SelfTest/Baselines/console.swa4.approved.txt
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@@ -14,6 +14,18 @@ PASSED:
 with message:
  yay

+-------------------------------------------------------------------------------
+#748 - captures with unexpected exceptions
+  outside assertions
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with messages:
+  answer := 42
+  expected exception
+
 -------------------------------------------------------------------------------
 #748 - captures with unexpected exceptions
  inside REQUIRE_NOTHROW
@@ -107,7 +119,7 @@ with expansion:

 MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( (*__error()) == 1 )
+  REQUIRE( errno == 1 )
 with expansion:
  1 == 1

@@ -133,5 +145,5 @@ ConditionTests.cpp:<line number>: FAILED:

 ===============================================================================
 test cases:  6 |  3 passed | 1 failed | 2 failed as expected
-assertions: 17 | 11 passed | 4 failed | 2 failed as expected
+assertions: 18 | 11 passed | 4 failed | 3 failed as expected

--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesspanner>
-  <testsuite name="<exe-name>" errors="8" failures="76" tests="963" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="13" failures="77" tests="970" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
    <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
+    <testcase classname="#748 - captures with unexpected exceptions" name="outside assertions" time="{duration}">
+      <error type="TEST_CASE">
+expected exception
+answer := 42
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
    <testcase classname="#748 - captures with unexpected exceptions" name="inside REQUIRE_NOTHROW" time="{duration}">
      <error message="thisThrows()" type="REQUIRE_NOTHROW">
 expected exception
@@ -79,7 +86,12 @@ TrickyTests.cpp:<line number>
    <testcase classname="global" name="Absolute margin" time="{duration}"/>
    <testcase classname="global" name="AllOf matcher" time="{duration}"/>
    <testcase classname="global" name="An expression with side-effects should only be evaluated once" time="{duration}"/>
-    <testcase classname="global" name="An unchecked exception reports the line of the last assertion" time="{duration}"/>
+    <testcase classname="global" name="An unchecked exception reports the line of the last assertion" time="{duration}">
+      <error message="{Unknown expression after the reported line}">
+unexpected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
    <testcase classname="global" name="Anonymous test case 1" time="{duration}"/>
    <testcase classname="global" name="AnyOf matcher" time="{duration}"/>
    <testcase classname="global" name="Approximate PI" time="{duration}"/>
@@ -115,6 +127,12 @@ ExceptionTests.cpp:<line number>
    <testcase classname="global" name="Custom exceptions can be translated when testing for throwing as something else" time="{duration}">
      <error message="throwCustom(), std::exception" type="REQUIRE_THROWS_AS">
 custom exception - not std
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="Custom std-exceptions can be custom translated" time="{duration}">
+      <error type="TEST_CASE">
+custom std exception
 ExceptionTests.cpp:<line number>
      </error>
    </testcase>
@@ -219,10 +237,13 @@ MessageTests.cpp:<line number>
    </testcase>
    <testcase classname="global" name="INFO gets logged on failure, even if captured before successful assertions" time="{duration}">
      <failure message="2 == 1" type="CHECK">
+this message may be logged later
 this message should be logged
 MessageTests.cpp:<line number>
      </failure>
      <failure message="2 == 0" type="CHECK">
+this message may be logged later
+this message should be logged
 and this, but later
 MessageTests.cpp:<line number>
      </failure>
@@ -282,6 +303,12 @@ ExceptionTests.cpp:<line number>
      </failure>
    </testcase>
    <testcase classname="global" name="Nice descriptive name" time="{duration}"/>
+    <testcase classname="global" name="Non-std exceptions can be translated" time="{duration}">
+      <error type="TEST_CASE">
+custom exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
    <testcase classname="global" name="NotImplemented exception" time="{duration}"/>
    <testcase classname="global" name="Objects that evaluated in boolean contexts can be checked" time="{duration}"/>
    <testcase classname="global" name="Operators at different namespace levels not hijacked by Koenig lookup" time="{duration}"/>
@@ -497,6 +524,12 @@ MiscTests.cpp:<line number>
    <testcase classname="Tracker" name="start a generator/Start a new inner section/Re-enter for second generation" time="{duration}"/>
    <testcase classname="Tracker" name="start a generator/Fail an inner section" time="{duration}"/>
    <testcase classname="Tracker" name="start a generator/Fail an inner section/Re-enter for second generation" time="{duration}"/>
+    <testcase classname="global" name="Unexpected exceptions can be translated" time="{duration}">
+      <error type="TEST_CASE">
+3.14
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
    <testcase classname="global" name="Use a custom approx" time="{duration}"/>
    <testcase classname="Variadic macros" name="Section with one argument" time="{duration}"/>
    <testcase classname="Vector matchers" name="Contains (element)" time="{duration}"/>
@@ -533,6 +566,12 @@ MatchersTests.cpp:<line number>
      </failure>
    </testcase>
    <testcase classname="global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}"/>
+    <testcase classname="global" name="When unchecked exceptions are thrown directly they are always failures" time="{duration}">
+      <error type="TEST_CASE">
+unexpected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
    <testcase classname="global" name="When unchecked exceptions are thrown during a CHECK the test should continue" time="{duration}">
      <error message="thisThrows() == 0" type="CHECK">
 expected exception
@@ -548,6 +587,12 @@ ExceptionTests.cpp:<line number>
    <testcase classname="global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}">
      <error message="thisThrows() == 0" type="CHECK">
 expected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="When unchecked exceptions are thrown from sections they are always failures" name="section name" time="{duration}">
+      <error type="TEST_CASE">
+unexpected exception
 ExceptionTests.cpp:<line number>
      </error>
    </testcase>
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -6,7 +6,13 @@
    </TestCase>
    <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
      <Section name="outside assertions" filename="projects/<exe-name>/ExceptionTests.cpp" >
-        <OverallResults successes="0" failures="0" expectedFailures="0"/>
+        <Info>
+          answer := 42
+        </Info>
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+          expected exception
+        </Exception>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
      </Section>
      <Section name="inside REQUIRE_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
        <Info>
@@ -122,7 +128,7 @@
      </Expression>
      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
        <Original>
-          (*__error()) == 1
+          errno == 1
        </Original>
        <Expanded>
          1 == 1
@@ -506,7 +512,18 @@
          1 == 1
        </Expanded>
      </Expression>
-      <OverallResult success="true"/>
+      <Expression success="false" filename="projects/<exe-name>/ExceptionTests.cpp" >
+        <Original>
+          {Unknown expression after the reported line}
+        </Original>
+        <Expanded>
+          {Unknown expression after the reported line}
+        </Expanded>
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+          unexpected exception
+        </Exception>
+      </Expression>
+      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="Anonymous test case 1" filename="projects/<exe-name>/VariadicMacrosTests.cpp" >
      <OverallResult success="true"/>
@@ -1110,7 +1127,10 @@
      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="Custom std-exceptions can be custom translated" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <OverallResult success="true"/>
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+        custom std exception
+      </Exception>
+      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="Demonstrate that a non-const == is not used" tags="[Tricky]" filename="projects/<exe-name>/TrickyTests.cpp" >
      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
@@ -2724,6 +2744,9 @@
          2 == 2
        </Expanded>
      </Expression>
+      <Info>
+        this message may be logged later
+      </Info>
      <Info>
        this message should be logged
      </Info>
@@ -2735,6 +2758,12 @@
          2 == 1
        </Expanded>
      </Expression>
+      <Info>
+        this message may be logged later
+      </Info>
+      <Info>
+        this message should be logged
+      </Info>
      <Info>
        and this, but later
      </Info>
@@ -2746,6 +2775,15 @@
          2 == 0
        </Expanded>
      </Expression>
+      <Info>
+        this message may be logged later
+      </Info>
+      <Info>
+        this message should be logged
+      </Info>
+      <Info>
+        and this, but later
+      </Info>
      <Info>
        but not this
      </Info>
@@ -4635,7 +4673,10 @@ re>"
      <OverallResult success="true"/>
    </TestCase>
    <TestCase name="Non-std exceptions can be translated" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <OverallResult success="true"/>
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+        custom exception
+      </Exception>
+      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="NotImplemented exception" tags="[!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
@@ -8586,7 +8627,10 @@ there"
      <OverallResult success="true"/>
    </TestCase>
    <TestCase name="Unexpected exceptions can be translated" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <OverallResult success="true"/>
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+        3.14
+      </Exception>
+      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="Use a custom approx" tags="[Approx][custom]" filename="projects/<exe-name>/ApproxTests.cpp" >
      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
@@ -8849,7 +8893,10 @@ there"
      <OverallResult success="true"/>
    </TestCase>
    <TestCase name="When unchecked exceptions are thrown directly they are always failures" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <OverallResult success="true"/>
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+        unexpected exception
+      </Exception>
+      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="When unchecked exceptions are thrown during a CHECK the test should continue" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
@@ -8895,9 +8942,12 @@ there"
    </TestCase>
    <TestCase name="When unchecked exceptions are thrown from sections they are always failures" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
      <Section name="section name" filename="projects/<exe-name>/ExceptionTests.cpp" >
-        <OverallResults successes="0" failures="0" expectedFailures="0"/>
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+          unexpected exception
+        </Exception>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
      </Section>
-      <OverallResult success="true"/>
+      <OverallResult success="false"/>
    </TestCase>
    <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test" tags="[!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
      <OverallResult success="true"/>
@@ -10082,7 +10132,7 @@ spanner      <OverallResult success="true"/>
      </Section>
      <OverallResult success="true"/>
    </TestCase>
-    <OverallResults successes="859" failures="84" expectedFailures="20"/>
+    <OverallResults successes="859" failures="90" expectedFailures="21"/>
  </Group>
-  <OverallResults successes="859" failures="83" expectedFailures="20"/>
+  <OverallResults successes="859" failures="89" expectedFailures="21"/>
 </Catch>
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -36,6 +36,13 @@ exeNameParser = re.compile(r'''
 # This is a hack until something more reasonable is figured out
 specialCaseParser = re.compile(r'file\((\d+)\)')

+# errno macro expands into various names depending on platform, so we need to fix them up as well
+errnoParser = re.compile(r'''
+    \(\*__errno_location\ \(\)\)
+    |
+    \(\*__error\(\)\)
+''', re.VERBOSE)
+
 if len(sys.argv) == 2:
    cmdPath = sys.argv[1]
 else:
@@ -45,9 +52,9 @@ overallResult = 0

 def diffFiles(fileA, fileB):
    with open(fileA, 'r') as file:
-        aLines = file.readlines()
+        aLines = [line.rstrip() for line in file.readlines()]
    with open(fileB, 'r') as file:
-        bLines = file.readlines()
+        bLines = [line.rstrip() for line in file.readlines()]

    shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1]
    shortenedFilenameB = fileB.rsplit(os.sep, 1)[-1]
@@ -90,6 +97,7 @@ def filterLine(line):
    line = durationsParser.sub(' time="{duration}"', line)
    line = timestampsParser.sub(' timestamp="{iso8601-timestamp}"', line)
    line = specialCaseParser.sub('file:\g<1>', line)
+    line = errnoParser.sub('errno', line)
    return line


@@ -119,7 +127,7 @@ def approve(baseName, args):
    if os.path.exists(baselinesPath):
        diffResult = diffFiles(baselinesPath, filteredResultsPath)
        if diffResult:
-            print(''.join(diffResult))
+            print('\n'.join(diffResult))
            print("  \n****************************\n  \033[91mResults differed")
            if len(diffResult) > overallResult:
                overallResult = len(diffResult)
--- a/scripts/updateVcpkgPackage.py
+++ b/scripts/updateVcpkgPackage.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+
+import io, os, re, sys, subprocess
+import hashlib
+
+from scriptCommon import catchPath
+from releaseCommon import Version
+
+print(catchPath)
+
+default_path = '../vcpkg/ports/catch/'
+
+def adjusted_path(path):
+    return os.path.join(catchPath, path)
+
+def get_hash(path):
+    BUFF_SIZE = 65536
+    sha512 = hashlib.sha512()
+    # The newlines should be normalized into \n, which is what we want
+    # If reused use 'rb' with a file written with io.open(newline='\n')
+    with open(path, 'r') as f:
+        while True:
+            data = f.read(BUFF_SIZE)
+            if not data:
+                break
+            if sys.version_info[0] < 3:
+                sha512.update(data)
+            else:
+                sha512.update(data.encode('utf-8'))
+    return sha512.hexdigest()
+
+def update_control(path):
+    v = Version()
+    ver_string = v.getVersionString()
+
+    # Update control
+    lines = []
+    control_path = os.path.join(path, 'CONTROL')
+    with open(control_path, 'r') as f:
+        for line in f:
+            lines.append(line)
+    with open(control_path, 'w') as f:
+        for line in lines:
+            if 'Version: ' in line:
+                line = 'Version: {}\n'.format(v.getVersionString())
+            f.write(line)
+
+def update_portfile(path, header_hash, licence_hash):
+    print('Updating portfile')
+    v = Version()
+    ver_string = v.getVersionString()
+
+    # Update portfile
+    lines = []
+    portfile_path = os.path.join(path, 'portfile.cmake')
+    with open(portfile_path, 'r') as f:
+        for line in f:
+            lines.append(line)
+    with open(portfile_path, 'w') as f:
+        # Two things we need to change/update
+        # 1) Link and hash of releaseCommon
+        # 2) Link and hash of licence
+        # We could assume licence never changes, but where is the fun in that?
+        first_hash = True
+        for line in lines:
+            # Check what we are updating
+            if 'vcpkg_download_distfile' in line:
+                kind = line.split('(')[-1].strip()
+                print(kind)
+
+            # Deal with URLS
+            if 'URLS' in line and kind == 'HEADER':
+                line = '    URLS "https://github.com/philsquared/Catch/releases/download/v{}/catch.hpp"\n'.format(v.getVersionString())
+            if 'URLS' in line and kind == 'LICENSE':
+                line = '    URLS "https://raw.githubusercontent.com/philsquared/Catch/v{}/LICENSE.txt"\n'.format(v.getVersionString())
+
+            # Deal with hashes
+            if 'SHA512' in line and kind == 'HEADER':
+                line = '    SHA512 {}\n'.format(header_hash)
+            if 'SHA512' in line and kind == 'LICENSE':
+                line = '    SHA512 {}\n'.format(licence_hash)
+            f.write(line)
+
+
+def git_push(path_to_repo):
+    v = Version()
+    ver_string = v.getVersionString()
+
+    # Move to the repo dir
+    old_path = os.getcwd()
+    os.chdir(path_to_repo)
+
+    # Work with git
+    # Make sure we branch off master
+    subprocess.call('git checkout master', shell=True)
+    
+    # Update repo to current master, so we don't work off old version of the portsfile 
+    subprocess.call('git pull Microsoft master', shell=True)
+
+    # Create a new branch for the update
+    subprocess.call('git checkout -b catch-{}'.format(ver_string), shell=True)
+    # Add changed files (should be only our files)
+    subprocess.call('git add -u .', shell=True)
+    # Create a commit with these changes
+    subprocess.call('git commit -m "Update Catch to {}"'.format(ver_string), shell=True)
+    # Don't push, so author can review
+    print('Changes were commited to the vcpkg fork. Please check, push and open PR.')
+
+header_hash = get_hash(adjusted_path('single_include/catch.hpp'))
+licence_hash = get_hash(adjusted_path('LICENSE.txt'))
+update_control(adjusted_path(default_path))
+update_portfile(adjusted_path(default_path), header_hash, licence_hash)
+
+git_push(adjusted_path('../vcpkg'))
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v1.9.0
- *  Generated: 2017-04-07 22:51:48.249456
+ *  Catch v1.9.4
+ *  Generated: 2017-05-16 13:51:55.506519
 *  ----------------------------------------------------------
 *  This file has been merged from multiple headers. Please don't edit it directly
 *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -136,13 +136,19 @@
 #endif // __clang__

 ////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__)

 #   if !defined(CATCH_CONFIG_POSIX_SIGNALS)
 #       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
 #   endif

+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
 // Required for some versions of Cygwin to declare gettimeofday
 // see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
 #   define _BSD_SOURCE
@@ -2266,7 +2272,7 @@ namespace Catch {
            INTERNAL_CATCH_REACT( __catchResult ) \
        } while( Catch::alwaysFalse() )
 #else
-    #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \
+    #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, log ) \
        do { \
            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
            __catchResult << log + ::Catch::StreamEndStop(); \
@@ -2397,14 +2403,19 @@ namespace Catch {
 // #included from: catch_timer.h
 #define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED

-#ifdef CATCH_PLATFORM_WINDOWS
-typedef unsigned long long uint64_t;
+#ifdef _MSC_VER
+
+namespace Catch {
+    typedef unsigned long long UInt64;
+}
 #else
 #include <stdint.h>
+namespace Catch {
+    typedef uint64_t UInt64;
+}
 #endif

 namespace Catch {
-
    class Timer {
    public:
        Timer() : m_ticks( 0 ) {}
@@ -2414,7 +2425,7 @@ namespace Catch {
        double getElapsedSeconds() const;

    private:
-        uint64_t m_ticks;
+        UInt64 m_ticks;
    };

 } // namespace Catch
@@ -2769,16 +2780,17 @@ namespace Detail {
            return Approx( 0 );
        }

-        Approx operator()( double value ) {
-            Approx approx( value );
+#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS)
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T value ) {
+            Approx approx( static_cast<double>(value) );
            approx.epsilon( m_epsilon );
            approx.margin( m_margin );
            approx.scale( m_scale );
            return approx;
        }

-#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS)
-
        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
        explicit Approx( T value ): Approx(static_cast<double>(value))
        {}
@@ -2828,7 +2840,35 @@ namespace Detail {
        friend bool operator >= ( Approx const& lhs, T rhs ) {
            return lhs.m_value > double(rhs) || lhs == rhs;
        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T newEpsilon ) {
+            m_epsilon = double(newEpsilon);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T newMargin ) {
+            m_margin = double(newMargin);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T newScale ) {
+            m_scale = double(newScale);
+            return *this;
+        }
+
 #else
+
+        Approx operator()( double value ) {
+            Approx approx( value );
+            approx.epsilon( m_epsilon );
+            approx.margin( m_margin );
+            approx.scale( m_scale );
+            return approx;
+        }
+
        friend bool operator == ( double lhs, Approx const& rhs ) {
            // Thanks to Richard Harris for his help refining this formula
            bool relativeOK = std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) );
@@ -2865,7 +2905,6 @@ namespace Detail {
        friend bool operator >= ( Approx const& lhs, double rhs ) {
            return lhs.m_value > rhs || lhs == rhs;
        }
-#endif

        Approx& epsilon( double newEpsilon ) {
            m_epsilon = newEpsilon;
@@ -2881,6 +2920,7 @@ namespace Detail {
            m_scale = newScale;
            return *this;
        }
+#endif

        std::string toString() const {
            std::ostringstream oss;
@@ -3133,8 +3173,18 @@ namespace Catch {
        }

    private:
-        T* nullableValue;
-        char storage[sizeof(T)];
+        T *nullableValue;
+        union {
+            char storage[sizeof(T)];
+
+            // These are here to force alignment for the storage
+            long double dummy1;
+            void (*dummy2)();
+            long double dummy3;
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+            long long dummy4;
+#endif
+        };
    };

 } // end namespace Catch
@@ -6592,8 +6642,9 @@ namespace Catch {
                m_totals.assertions.failed++;
            }

-            if( m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) ) )
-                m_messages.clear();
+            // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+            // and should be let to clear themselves out.
+            static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));

            // Reset working state
            m_lastAssertionInfo = AssertionInfo( std::string(), m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition );
@@ -6748,11 +6799,9 @@ namespace Catch {
            catch(...) {
                // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
                // are reported without translation at the point of origin.
-#ifdef CATCH_CONFIG_FAST_COMPILE
                if (m_shouldReportUnexpected) {
                    makeUnexpectedResultBuilder().useActiveException();
                }
-#endif
            }
            m_testCaseTracker->close();
            handleUnfinishedSections();
@@ -7004,6 +7053,32 @@ namespace Catch {
            return returnCode;
        }

+    #if defined(WIN32) && defined(UNICODE)
+        int run( int argc, wchar_t const* const* const argv ) {
+
+            char **utf8Argv = new char *[ argc ];
+
+            for ( int i = 0; i < argc; ++i ) {
+                int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+
+                utf8Argv[ i ] = new char[ bufSize ];
+
+                WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+            }
+
+            int returnCode = applyCommandLine( argc, utf8Argv );
+            if( returnCode == 0 )
+                returnCode = run();
+
+            for ( int i = 0; i < argc; ++i )
+                delete [] utf8Argv[ i ];
+
+            delete [] utf8Argv;
+
+            return returnCode;
+        }
+    #endif
+
        int run() {
            if( m_configData.showHelp )
                return 0;
@@ -8234,7 +8309,7 @@ namespace Catch {
    }

    inline Version libraryVersion() {
-        static Version version( 1, 9, 0, "", 0 );
+        static Version version( 1, 9, 4, "", 0 );
        return version;
    }

@@ -8420,21 +8495,21 @@ namespace Catch {

    namespace {
 #ifdef CATCH_PLATFORM_WINDOWS
-        uint64_t getCurrentTicks() {
-            static uint64_t hz=0, hzo=0;
+        UInt64 getCurrentTicks() {
+            static UInt64 hz=0, hzo=0;
            if (!hz) {
                QueryPerformanceFrequency( reinterpret_cast<LARGE_INTEGER*>( &hz ) );
                QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
            }
-            uint64_t t;
+            UInt64 t;
            QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
            return ((t-hzo)*1000000)/hz;
        }
 #else
-        uint64_t getCurrentTicks() {
+        UInt64 getCurrentTicks() {
            timeval t;
            gettimeofday(&t,CATCH_NULL);
-            return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
+            return static_cast<UInt64>( t.tv_sec ) * 1000000ull + static_cast<UInt64>( t.tv_usec );
        }
 #endif
    }
@@ -10220,7 +10295,8 @@ namespace Catch {
    public:
        JunitReporter( ReporterConfig const& _config )
        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
+            xml( _config.stream() ),
+            m_okToFail( false )
        {
            m_reporterPrefs.shouldRedirectStdOut = true;
        }
@@ -10246,8 +10322,11 @@ namespace Catch {
            CumulativeReporterBase::testGroupStarting( groupInfo );
        }

+        virtual void testCaseStarting( TestCaseInfo const& testCaseInfo ) CATCH_OVERRIDE {
+            m_okToFail = testCaseInfo.okToFail();
+        }
        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-            if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException )
+            if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
                unexpectedExceptions++;
            return CumulativeReporterBase::assertionEnded( assertionStats );
        }
@@ -10412,6 +10491,7 @@ namespace Catch {
        std::ostringstream stdOutForSuite;
        std::ostringstream stdErrForSuite;
        unsigned int unexpectedExceptions;
+        bool m_okToFail;
    };

    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
@@ -11215,8 +11295,14 @@ namespace Catch {

 #ifndef __OBJC__

+#if defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
 // Standard C/C++ main entry point
 int main (int argc, char * argv[]) {
+#endif
+
 	int result = Catch::Session().run( argc, argv );
    return ( result < 0xff ? result : 0xff );
 }
@@ -11296,7 +11382,7 @@ int main (int argc, char * const argv[]) {
    #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
    #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
    #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-    #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ )
+    #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
    #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
    #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
 #else
Author	SHA1	Message	Date
Martin Hořeňovský	3dcc923351	v1.9.4	2017-05-16 13:59:29 +02:00
Martin Hořeňovský	589c40077b	Typo fix Somehow I made that in `5ffc8a84cd` without noticing	2017-05-16 13:51:17 +02:00
Antonio Di Monaco	b8443e67da	Added Win32 UNICODE wmain support (#903 ) * Added wmain support * Added appveyor.yml wmain configuration * Added wmain configuration flag to CMake	2017-05-11 13:00:03 +02:00
Martin Hořeňovský	5604ec7266	Updated toString documentation It will need another update when Catch 2 goes live. Closes #741	2017-05-03 21:09:27 +02:00
Benjamin R. Jack	6f012f2d1d	Added warning if source file cannot be found If source files are defined using relative paths, CMake will compile the tests, but this script will (sometimes) fail to find and parse the tests from the source files. I have added an explicit warning when ParseAndAddCatchTests fails to find a source file.	2017-05-01 19:55:17 +02:00
Martin Hořeňovský	98e61c31df	Approval tests now see different line endings as ok This is mostly to deal with WSL, where git will checkout file with CRLF, but code that uses formatted output will be writing LFs.	2017-04-29 18:06:36 +02:00
Martin Hořeňovský	e641485132	Updated approval tests	2017-04-29 17:54:10 +02:00
Martin Hořeňovský	a3ceb8f007	Approval tests now can deal with different expansions of errno	2017-04-29 17:52:12 +02:00
Martin Hořeňovský	b819432271	Don't clear out all messages upon printing an assertion. Previously, this would not print out any messages for the last CHECK ```cpp TEST_CASE("Foo") { INFO("Test case start"); for (int i = 0; i < 2; ++i) { INFO("The number is " << i); CHECK(i == 0); } CHECK(false); } ``` now it does.	2017-04-29 17:50:03 +02:00
Martin Hořeňovský	9ceae8f51f	CMake binaries are now conditionally enabled Defining NO_SELFTEST=1 when cmake configuration is being done now turns off SelfTest and Benchmark executables. This is for projects that consume Catch using ExternalProject_Add and don't want to build our selftest binaries for their unit test suite. Closes #897	2017-04-28 20:27:10 +02:00
Martin Hořeňovský	5ffc8a84cd	Fix order of arguments in CATCH_FAIL and nonvariadic INTERNAL_CATCH_MSG Fixes #896	2017-04-28 18:30:04 +02:00
JayAndCatchFire	6e0fa4be68	Update opensource-users.md Fixed broken link to LICENSE	2017-04-27 10:29:58 +02:00
Phil Nash	a0ada2e935	v1.9.3	2017-04-25 14:23:06 +00:00
Phil Nash	e4694f58da	Removed errant uses of uint64_t fixes #894	2017-04-25 14:15:59 +00:00
Martin Hořeňovský	fc7f0a02b8	v1.9.2	2017-04-25 11:08:02 +02:00
Phil Nash	211b330346	Don’t unconditionally #include <stdint.h> (as earlier MSVC don’t have it)	2017-04-25 08:43:14 +01:00
Phil Nash	d36fe214a6	Further tweaked alignment hack for Option	2017-04-25 08:38:25 +01:00
Martin Hořeňovský	a34c053f0a	All of Approx's member functions now accept strong typedefs Previously `Approx::operator()`, `Approx::epsilon`, `Approx::margin` and `Approx::scale` didn't. Closes #888	2017-04-24 22:01:45 +02:00
Martin Hořeňovský	4cdb203ec3	Improve documentation about using Catch with CMake Also added a note about the `contrib/ParseAndAddCatchTests.cmake` script. Closes #882	2017-04-24 16:27:43 +02:00
Ernst Maurer	8014bf1124	cmake script to generate ctest definitions from catch tests: fix for test case body bracket	2017-04-24 13:33:04 +02:00
Alexander Batischev	49d87cf182	Add Newsbeuter to OSS users list (#891 )	2017-04-22 16:02:55 +02:00
Phil Nash	eedcc82d31	Tweaked storage alignment "workaround" a bit more in Option.	2017-04-21 07:19:39 +01:00
Martin Hořeňovský	8e8259091c	Fix .travis.yml syntax	2017-04-20 22:54:17 +02:00
Martin Hořeňovský	7869e5b007	Enable C++11 and C++14 on OSX on Travis	2017-04-20 22:52:41 +02:00
Martin Hořeňovský	a49af4648c	Minor .travis.yml cleanup Still could use someone more experienced to clean it up properly...	2017-04-20 22:50:07 +02:00
Martin Hořeňovský	417b2bcf5c	Enable C++14 on Linux on Travis	2017-04-20 22:47:05 +02:00
Martin Hořeňovský	8f0feaa6d2	Enable /std:c++latest (C++17) for AppVeyor VS 2017	2017-04-20 21:32:50 +02:00
Martin Hořeňovský	b95163bd3a	Don't enable POSIX signals under QNX Fixes #889	2017-04-20 21:02:25 +02:00
Phil Nash	2809be87cc	“fixed” alignment in Option	2017-04-20 14:39:07 +01:00
Martin Hořeňovský	ac369b7b83	Add script that helps with updating the Vcpkg package. Kind of a hackjob, that assumes vcpkg is already checked out and is next to the Catch's directory.	2017-04-11 17:25:04 +02:00
Ernst Maurer	1aa3e4abfa	Add CMake script to generate ctest definitions from Catch tests (#879 ) Added cmake script to parse the source files containing Catch's test and generate ctest definitions. It generates one ctest test per `TEST_CASE` and labels them, using the `TEST_CASE`'s tags. Closes #719.	2017-04-11 16:51:02 +02:00
Phil Nash	e5c5a636a9	junit reporter does not count exceptions as failures if ok-to-fail	2017-04-11 15:47:42 +01:00
Phil Nash	2bf30e9e5a	Use (locally defined) UInt64 instead of uint64_t - typedefs long long for MSVC - typedefs uint64_t otherwise Should probably do finer grained compiler checking - but this should at least be better than what was there before	2017-04-11 15:06:25 +01:00
Phil Nash	b591cb9a03	Added note about thread safety in assertions - closes #875	2017-04-11 14:25:19 +01:00
Phil Nash	714d01c07c	approved tests that were correct the first time (previous approvals were erroneous)	2017-04-09 20:40:11 +01:00
Martin Hořeňovský	c6990cdf91	v1.9.1 release	2017-04-09 21:25:20 +02:00
Martin Hořeňovský	da8786b8fd	Unexpected exception are no longer ignored by default What an embarassing bug, I'll have to look into why it wasn't caught by any of Catch's self-tests. Fixes #885 and closes #887 (duplicate)	2017-04-09 21:20:58 +02:00
Phil Nash	5577322062	Added Nonius to open-sources users	2017-04-08 22:47:13 +01:00