merge from upstream

This commit is contained in:
Malcolm Noyes
2013-12-27 13:55:25 +00:00
13 changed files with 156 additions and 122 deletions

View File

@@ -116,9 +116,9 @@ namespace MiscTests
TEST_CASE( "Sends stuff to stdout and stderr", "" )
{
std::cout << "Some information" << std::endl;
std::cout << "A string sent directly to stdout" << std::endl;
std::cerr << "An error" << std::endl;
std::cerr << "A string sent directly to stderr" << std::endl;
}
inline const char* makeString( bool makeNull )