From bee27dfb33506c7055ac88416f2ca608eb2dfd87 Mon Sep 17 00:00:00 2001 From: brmclare Date: Wed, 31 Mar 2021 21:50:48 +0000 Subject: [PATCH] remove quote provider declaration option for windows cross compile Signed-off-by: brmclare --- src/jenkins/common/Openenclave.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jenkins/common/Openenclave.groovy b/src/jenkins/common/Openenclave.groovy index e4d973a..c878eb8 100644 --- a/src/jenkins/common/Openenclave.groovy +++ b/src/jenkins/common/Openenclave.groovy @@ -127,13 +127,13 @@ def emailJobStatus(String status) { * Compile open-enclave on Windows platform, generate NuGet package out of it, * install the generated NuGet package, and run samples tests against the installation. */ -def WinCompilePackageTest(String dirName, String buildType, String hasQuoteProvider, Integer timeoutSeconds, String lviMitigation = 'None', String lviMitigationSkipTests = 'ON', List extra_cmake_args = []) { +def WinCompilePackageTest(String dirName, String buildType, Integer timeoutSeconds, String lviMitigation = 'None', String lviMitigationSkipTests = 'ON', List extra_cmake_args = []) { cleanWs() checkout scm dir(dirName) { bat """ vcvars64.bat x64 && \ - cmake.exe ${WORKSPACE} -G Ninja -DCMAKE_BUILD_TYPE=${buildType} -DBUILD_ENCLAVES=ON -DHAS_QUOTE_PROVIDER=${hasQuoteProvider} -DLVI_MITIGATION=${lviMitigation} -DLVI_MITIGATION_SKIP_TESTS=${lviMitigationSkipTests} -DNUGET_PACKAGE_PATH=C:/oe_prereqs -DCPACK_GENERATOR=NuGet -Wdev ${extra_cmake_args.join(' ')} && \ + cmake.exe ${WORKSPACE} -G Ninja -DCMAKE_BUILD_TYPE=${buildType} -DBUILD_ENCLAVES=ON -DLVI_MITIGATION=${lviMitigation} -DLVI_MITIGATION_SKIP_TESTS=${lviMitigationSkipTests} -DNUGET_PACKAGE_PATH=C:/oe_prereqs -DCPACK_GENERATOR=NuGet -Wdev ${extra_cmake_args.join(' ')} && \ ninja.exe && \ ctest.exe -V -C ${buildType} --timeout ${timeoutSeconds} && \ cpack.exe -D CPACK_NUGET_COMPONENT_INSTALL=ON -DCPACK_COMPONENTS_ALL=OEHOSTVERIFY && \