This is an archive of the discontinued LLVM Phabricator instance.

Port the variadic std::tr1::tuple hack for building gtest for MSVC2012 to ASAN tests.
ClosedPublic

Authored by • ehsan on Sep 13 2014, 8:03 AM.

Download Raw Diff

Details

Reviewers

Commits

rG47d260962f35: Port the variadic std::tr1::tuple hack for building gtest for MSVC2012 to ASAN…
rCRT217762: Port the variadic std::tr1::tuple hack for building gtest for MSVC2012 to ASAN…
rL217762: Port the variadic std::tr1::tuple hack for building gtest for MSVC2012 to ASAN…

Summary

This is copied from llvm/utils/unittest/CMakeLists.txt.

Diff Detail

Event Timeline

• ehsan updated this revision to Diff 13674.Sep 13 2014, 8:03 AM

• ehsan retitled this revision from to Port the variadic std::tr1::tuple hack for building gtest for MSVC2012 to ASAN tests..

• ehsan updated this object.

• ehsan edited the test plan for this revision. (Show Details)

• ehsan added a reviewer: timurrrr.

• ehsan added a subscriber: Unknown Object (MLST).

LGTM

This revision is now accepted and ready to land.Sep 15 2014, 3:32 AM

Closed by commit rL217762 (authored by @ehsan).

Revision Contents

Path

Size

cmake/

Modules/

AddCompilerRT.cmake

6 lines

Diff 13674

cmake/Modules/AddCompilerRT.cmake

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines	if(MSVC)
# We should teach clang to understand "#pragma intrinsic", see PR19898.		# We should teach clang to understand "#pragma intrinsic", see PR19898.
list(APPEND COMPILER_RT_TEST_CFLAGS -Wno-undefined-inline)		list(APPEND COMPILER_RT_TEST_CFLAGS -Wno-undefined-inline)

# Clang doesn't support SEH on Windows yet.		# Clang doesn't support SEH on Windows yet.
list(APPEND COMPILER_RT_GTEST_CFLAGS -DGTEST_HAS_SEH=0)		list(APPEND COMPILER_RT_GTEST_CFLAGS -DGTEST_HAS_SEH=0)

# gtest use a lot of stuff marked as deprecated on Windows.		# gtest use a lot of stuff marked as deprecated on Windows.
list(APPEND COMPILER_RT_GTEST_CFLAGS -Wno-deprecated-declarations)		list(APPEND COMPILER_RT_GTEST_CFLAGS -Wno-deprecated-declarations)

		# Visual Studio 2012 only supports up to 8 template parameters in
		# std::tr1::tuple by default, but gtest requires 10
		if(MSVC_VERSION EQUAL 1700)
		add_definitions(-D_VARIADIC_MAX=10)
		endif()
endif()		endif()

# Link objects into a single executable with COMPILER_RT_TEST_COMPILER,		# Link objects into a single executable with COMPILER_RT_TEST_COMPILER,
# using specified link flags. Make executable a part of provided		# using specified link flags. Make executable a part of provided
# test_suite.		# test_suite.
# add_compiler_rt_test(<test_suite> <test_name>		# add_compiler_rt_test(<test_suite> <test_name>
# OBJECTS <object files>		# OBJECTS <object files>
# DEPS <deps (e.g. runtime libs)>		# DEPS <deps (e.g. runtime libs)>
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines