Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding enclave tests to Windows CI #1011

Merged
merged 2 commits into from
Oct 31, 2018
Merged

Adding enclave tests to Windows CI #1011

merged 2 commits into from
Oct 31, 2018

Conversation

johnkord
Copy link
Contributor

This enables the building of the OE tests on Linux, copying them to a Windows system, and then running the Windows build with the tests built on Linux.

NOTE: I had to lower the enclave memory requirements to the props test in order for the test to pass on Windows. Please review this change carefully, as I'm not sure how low it should be.

@johnkord johnkord added testing Issue has to do with testing or quality management windows Issue has to do with supporting Open Enclave on Windows labels Oct 31, 2018
@johnkord johnkord self-assigned this Oct 31, 2018
@johnkord
Copy link
Contributor Author

bors try

oe-bors bot pushed a commit that referenced this pull request Oct 31, 2018
@oe-bors
Copy link

oe-bors bot commented Oct 31, 2018

try

Build succeeded

steps {
unstash 'linuxdebug'
bat 'move build linuxbin'
bat 'mkdir build && cd build && cmake -G "Visual Studio 15 2017 Win64" -DADD_WINDOWS_ENCLAVE_TESTS=1 -DLINUX_BIN_DIR=%cd%\\linuxbin\\tests .. && pushd . && "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\LaunchDevCmd.bat" && popd && cmake --build . --config Debug && ctest -V -C Debug'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, consider breaking this across lines for readability, or pushing this into a separate script file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CodeMonkeyLeet Thanks Simon, I'll add a separate script file in my next PR

Copy link
Contributor

@CodeMonkeyLeet CodeMonkeyLeet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@johnkord
Copy link
Contributor Author

bors r+

oe-bors bot pushed a commit that referenced this pull request Oct 31, 2018
1011: Adding enclave tests to Windows CI r=johnkord a=johnkord

This enables the building of the OE tests on Linux, copying them to a Windows system, and then running the Windows build with the tests built on Linux.

NOTE: I had to lower the enclave memory requirements to the props test in order for the test to pass on Windows. Please review this change carefully, as I'm not sure how low it should be.

Co-authored-by: John Kordich <johnkord@microsoft.com>
@oe-bors
Copy link

oe-bors bot commented Oct 31, 2018

Build succeeded

@oe-bors oe-bors bot merged commit b4d4719 into master Oct 31, 2018
@oe-bors oe-bors bot deleted the johnkord-CI_windows_2 branch October 31, 2018 21:15
@CodeMonkeyLeet CodeMonkeyLeet added this to In progress in v0.5x via automation Nov 7, 2018
@CodeMonkeyLeet CodeMonkeyLeet added this to the 2018.10 milestone Nov 7, 2018
@CodeMonkeyLeet CodeMonkeyLeet moved this from In progress to Done in v0.5x Nov 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing Issue has to do with testing or quality management windows Issue has to do with supporting Open Enclave on Windows
Projects
No open projects
v0.5x
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants