From 85f66153ab477f412386c93be2a9a5bb8ac5813c Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 25 Apr 2011 02:00:43 +0000 Subject: [PATCH] renamed integ test entry point file --- cmake/CMakeLists_test.txt | 2 +- src/integtest/{IntegTestMain.cpp => Main.cpp} | 0 src/integtest/platform/CMSWindowsClipboardTests.cpp | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename src/integtest/{IntegTestMain.cpp => Main.cpp} (100%) diff --git a/cmake/CMakeLists_test.txt b/cmake/CMakeLists_test.txt index 7b09633f..19c03e32 100644 --- a/cmake/CMakeLists_test.txt +++ b/cmake/CMakeLists_test.txt @@ -20,7 +20,7 @@ set(unittests ) set(integtests - ${root_dir}/src/integtest/IntegTestMain.cpp + ${root_dir}/src/integtest/Main.cpp ) if(WIN32) diff --git a/src/integtest/IntegTestMain.cpp b/src/integtest/Main.cpp similarity index 100% rename from src/integtest/IntegTestMain.cpp rename to src/integtest/Main.cpp diff --git a/src/integtest/platform/CMSWindowsClipboardTests.cpp b/src/integtest/platform/CMSWindowsClipboardTests.cpp index 8da53113..7f2d93fe 100644 --- a/src/integtest/platform/CMSWindowsClipboardTests.cpp +++ b/src/integtest/platform/CMSWindowsClipboardTests.cpp @@ -101,6 +101,8 @@ TEST(CMSWindowsClipboardTests, close_isOpen_noErrors) // can't assert anything } +// looks like this test may fail intermittently: +// * http://buildbot.synergy-foss.org:8000/builders/trunk-win32/builds/246/steps/shell_3/logs/stdio TEST(CMSWindowsClipboardTests, getTime_openWithNoEmpty_returnsOne) { CMSWindowsClipboard clipboard(NULL);