Merge pull request #1898 from rstudio/bugfix/Windows-Unit-Tests

Fixed Windows unit tests building
rstudio · Jan 2, 2018 · bfff3e3 · bfff3e3
2 parents 44ab55a + d5d8676
commit bfff3e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -218,7 +218,7 @@ if(WIN32)
      include_directories(SYSTEM ${WINPTY_INCLUDEDIR})
 
      # openssl for Windows
-     if(RSTUDIO_SESSLIBRARY)
+     if(RSTUDIO_SESSION_WIN64 OR RSTUDIO_SESSLIBRARY)
         set(OPENSSL_ARCH "/x64/")
      else()
         set(OPENSSL_ARCH "/")

diff --git a/src/cpp/core/system/ChildProcessSubprocPollTests.cpp b/src/cpp/core/system/ChildProcessSubprocPollTests.cpp
@@ -16,7 +16,7 @@
 #include "ChildProcessSubprocPoll.hpp"
 
 #include <boost/bind.hpp>
-#include <boost/asio/deadline_timer.hpp>
+#include <boost/thread/thread.hpp>
 
 #include <tests/TestThat.hpp>
 
@@ -39,9 +39,7 @@ const milliseconds kCheckCwdDelayExpired = milliseconds(45);
 
 void blockingwait(milliseconds ms)
 {
-   boost::asio::io_service io;
-   boost::asio::deadline_timer timer(io, ms);
-   timer.wait();
+   boost::this_thread::sleep(ms);
 }
 
 class NoSubProcPollingFixture