Merge #211

211: Add Windows CI r=mzohreva a=parthsane Adding all the tests which pass on Windows As and when other tests pass, they can be added Co-authored-by: Parth Sane <parthsane@gmail.com>
fortanix · Mar 9, 2020 · 243570d · 243570d
2 parents 125245a + cffa826
commit 243570d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,24 +7,52 @@ branches:
     # Not really necessary, just to get a green badge on “master”
     - master
 language: rust
-dist: xenial
-addons:
-  apt:
-    sources:
-    - sourceline: 'deb https://download.01.org/intel-sgx/sgx_repo/ubuntu xenial main'
-      key_url: 'https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key'
-    packages:
-    - protobuf-compiler
-    - libsgx-dcap-ql-dev
-    - libclang-3.8-dev
-rust:
-  - nightly
-env:
-  - RUST_BACKTRACE=1 LLVM_CONFIG_PATH=llvm-3.8-config
-before_script:
-  - rustup target add x86_64-fortanix-unknown-sgx
-script:
-  - cargo test --verbose --all
-  - cargo test --verbose -p sgx-isa --features sgxstd -Z package-features --target x86_64-fortanix-unknown-sgx --no-run
-  - cargo test --verbose -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx -Z package-features
-  - cargo test --verbose -p dcap-ql --features link -Z package-features
+
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          sources:
+            - sourceline: 'deb https://download.01.org/intel-sgx/sgx_repo/ubuntu xenial main'
+              key_url: 'https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key'
+          packages:
+            - protobuf-compiler
+            - libsgx-dcap-ql-dev
+            - libclang-3.8-dev
+      rust:
+        - nightly
+      env:
+        - RUST_BACKTRACE=1 LLVM_CONFIG_PATH=llvm-3.8-config
+      before_script:
+        - rustup target add x86_64-fortanix-unknown-sgx
+      script:
+        - cargo test --verbose --all
+        - cargo test --verbose -p sgx-isa --features sgxstd -Z package-features --target x86_64-fortanix-unknown-sgx --no-run
+        - cargo test --verbose -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx -Z package-features
+        - cargo test --verbose -p dcap-ql --features link -Z package-features
+
+    - os: windows
+      before_install:
+        - choco install protoc
+        - choco install openssl
+      rust:
+        - nightly
+      env:
+        - RUST_BACKTRACE=1 LLVM_CONFIG_PATH=llvm-3.8-config OPENSSL_DIR="C:\Program Files\OpenSSL-Win64"
+      before_script:
+        - rustup default nightly-x86_64-pc-windows-msvc
+        - rustup target add x86_64-fortanix-unknown-sgx
+      script:
+        - rustup toolchain list
+        - cargo test --verbose -p aesm-client
+        - cargo test --verbose -p enclave-runner
+        - cargo test --verbose -p fortanix-sgx-abi
+        - cargo test --verbose -p fortanix-sgx-tools
+        - cargo test --verbose -p report-test
+        - cargo test --verbose -p rs-libc
+        - cargo test --verbose -p sgxs
+        - cargo test --verbose -p sgxs-loaders
+        - cargo test --verbose -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx -Z package-features
+
diff --git a/sgxs-loaders/Cargo.toml b/sgxs-loaders/Cargo.toml
@@ -30,4 +30,4 @@ failure_derive = "0.1.1" # MIT/Apache-2.0
 libloading = "0.5"       # ISC
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.7", features = ["enclaveapi","memoryapi"] }
+winapi = { version = "0.3.7", features = ["enclaveapi","memoryapi","processthreadsapi"] }