Commit d1db5313 authored by LEFEBVREJP email's avatar LEFEBVREJP email
Browse files

Updates to address Windows issues.

parent 325f15eb
Pipeline #87868 failed with stages
in 46 seconds
...@@ -2,12 +2,9 @@ stages: ...@@ -2,12 +2,9 @@ stages:
- test - test
- analysis - analysis
.windows_before_script: &windows_before_script
before_script:
- set PATH=%PATH%;c:\vendors\mingw-w64\x86_64-4.8.5-posix-seh-rt_v4-rev0\mingw64\bin;c:\vendors\mingw-w64\qt\5.9.1\bin
.windows_msvc_before_script: &windows_msvc_before_script .windows_msvc_before_script: &windows_msvc_before_script
before_script: before_script:
- set PATH=c:\Qt\5.9.1\msvc2013_64\bin;%PATH%;c:\Program Files (x86)\NSIS\Bin - set PATH=c:\Qt\5.9.1\msvc2013_64\bin;%PATH%;c:\Program Files (x86)\NSIS\Bin;c:\vendors\cl\libssh\0.9.3\bin;c:\vendors\cl\openssl\1.1.1d\bin
mac_llvm_testing: mac_llvm_testing:
tags: tags:
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
#include "rsmcore/sessioncontroller.hh" #include "rsmcore/sessioncontroller.hh"
#include "rsmcore/sessionworker.hh" #include "rsmcore/sessionworker.hh"
#ifdef _WIN32
#include <windows.h>
#endif
using namespace rsm; using namespace rsm;
TEST(RSM, SessionController) TEST(RSM, SessionController)
{ {
...@@ -17,5 +21,10 @@ TEST(RSM, SessionController) ...@@ -17,5 +21,10 @@ TEST(RSM, SessionController)
controller.requestExec("ls -la"); controller.requestExec("ls -la");
controller.disconnect(); controller.disconnect();
// sleep while we wait for the sessionworker to finish // sleep while we wait for the sessionworker to finish
#ifdef _WIN32
Sleep(5);
#else
sleep(5); sleep(5);
} #endif
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment