8000 Vs2015 support by annagrin · Pull Request #78 · unittest-cpp/unittest-cpp · GitHub
[go: up one dir, main page]
Skip to content

Vs2015 support #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2015
Merged

Vs2015 support #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@ project(UnitTest++)

option(UTPP_USE_PLUS_SIGN "Set this to OFF is you with to use '-cpp' instead of '++' in lib/include paths" ON)

if(MSVC14 OR MSVC12)
# has the support we need
else()
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
if(COMPILER_SUPPORTS_CXX14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
elseif(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
endif()
endif()

# get the main sources
file(GLOB headers_ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} UnitTest++/*.h)
file(GLOB sources_ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} UnitTest++/*.cpp)
Expand Down
4 changes: 2 additions & 2 deletions UnitTest++/TimeConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
namespace UnitTest {


TimeConstraint::TimeConstraint(int ms, TestDetails const& details)
: m_details(details)
TimeConstraint::TimeConstraint(int ms, TestDetails const& details, int lineNumber)
: m_details(details, lineNumber)
, m_maxMs(ms)
{
m_timer.Start();
Expand Down
8 changes: 4 additions & 4 deletions UnitTest++/TimeConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@

#include "TimeHelpers.h"
#include "HelperMacros.h"
#include "TestDetails.h"

namespace UnitTest {

class TestResults;
class TestDetails;

class UNITTEST_LINKAGE TimeConstraint
{
public:
TimeConstraint(int ms, TestDetails const& details);
TimeConstraint(int ms, TestDetails const& details, int lineNumber);
~TimeConstraint();

private:
void operator=(TimeConstraint const&);
TimeConstraint(TimeConstraint const&);

Timer m_timer;
TestDetails const& m_details;
TestDetails const m_details;
int const m_maxMs;
};

#define UNITTEST_TIME_CONSTRAINT(ms) \
UnitTest::TimeConstraint unitTest__timeConstraint__(ms, UnitTest::TestDetails(m_details, __LINE__))
UnitTest::TimeConstraint unitTest__timeConstraint__(ms, m_details, __LINE__)

#define UNITTEST_TIME_CONSTRAINT_EXEMPT() \
UNITTEST_MULTILINE_MACRO_BEGIN \
Expand Down
26 changes: 25 additions & 1 deletion tests/TestTestMacros.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,30 @@
using namespace UnitTest;
using namespace std;

/* test for c++11 support */
#ifndef _MSC_VER

/* Test for clang >= 3.3 */
#ifdef __clang__
#if (__clang__ == 1) && (__clang_major__ > 3 || (__clang_major__ == 3 && (__clang_minor__ > 2 )))
#define _NOEXCEPT_OP(x) noexcept(x)
#else
#define _NOEXCEPT_OP(x)
#endif
#endif

#ifndef __clang__
/* Test for GCC >= 4.8.0 */
#ifdef __GNUC__
#if (__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ > 7 ))
#define _NOEXCEPT_OP(x) noexcept(x)
#else
#define _NOEXCEPT_OP(x)
#endif
#endif
#endif
#endif

namespace {

TestList list1;
Expand Down Expand Up @@ -138,7 +162,7 @@ TEST(FixturesWithThrowingCtorsAreFailures)

struct FixtureDtorThrows
{
~FixtureDtorThrows() { throw "exception"; }
~FixtureDtorThrows() _NOEXCEPT_OP(false) { throw "exception"; }
};

TestList throwingFixtureTestList2;
Expand Down
8 changes: 4 additions & 4 deletions tests/TestTimeConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ TEST(TimeConstraintSucceedsWithFastTest)
TestResults result;
{
ScopedCurrentTest scopedResult(result);
TimeConstraint t(200, TestDetails("", "", "", 0));
TimeConstraint t(200, TestDetails("", "", "", 0), 0);
TimeHelpers::SleepMs(5);
}
CHECK_EQUAL(0, result.GetFailureCount());
Expand All @@ -25,7 +25,7 @@ TEST(TimeConstraintFailsWithSlowTest)
TestResults result;
{
ScopedCurrentTest scopedResult(result);
TimeConstraint t(10, TestDetails("", "", "", 0));
TimeConstraint t(10, TestDetails("", "", "", 0),0);
TimeHelpers::SleepMs(20);
}
CHECK_EQUAL(1, result.GetFailureCount());
Expand All @@ -39,7 +39,7 @@ TEST(TimeConstraintFailureIncludesCorrectData)
ScopedCurrentTest scopedResult(result);

TestDetails const details("testname", "suitename", "filename", 10);
TimeConstraint t(10, details);
TimeConstraint t(10, details,10);
TimeHelpers::SleepMs(20);
}

Expand All @@ -56,7 +56,7 @@ TEST(TimeConstraintFailureIncludesTimeoutInformation)
TestResults result(&reporter);
{
ScopedCurrentTest scopedResult(result);
TimeConstraint t(10, TestDetails("", "", "", 0));
TimeConstraint t(10, TestDetails("", "", "", 0),0);
TimeHelpers::SleepMs(20);
}

Expand Down
0