diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 27cc407168..68ca9e4f36 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -1,148 +1,271 @@ -// oetools-image:tag Docker image from OE Jenkins Registry -OETOOLS_IMAGE = "oejenkinscidockerregistry.azurecr.io/oetools-azure:1.7" - - -def coffeelakeTest(String compiler, String unit, String suite) { - stage("Coffeelake $compiler $unit $suite") { - node('hardware') { - checkout scm +pipeline { + agent any + stages { + stage('Build and Test') { + parallel { + stage('Check pre-commit requirements') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { + timeout(2) { + sh './scripts/check-precommit-reqs' + } + } + } + stage('Simulation default compiler') { + // This particular test asserts that everything (at least + // for simulation) can be built after using our + // install-prereqs script to bootstrap a machine. + agent { + dockerfile { + filename '.jenkins/Dockerfile.scripts' + } + } + steps { + timeout(15) { + // This is run to test that it works with the dependencies + // installed by our install-prereqs script. + sh './scripts/check-precommit-reqs' + // We actually expect `ctest` to fail because it is an + // older version that emits a failure if any tests are + // skipped. In other stages, we explicitly install an + // updated version of CMake. + dir('build') { + sh ''' + cmake .. + make + OE_SIMULATION=1 ctest --verbose --output-on-failure || true + ''' + // Note that `make package` is not expected to work + // without extra configuration. + } + } + } + } + stage('Simulation clang-7 SGX1 Debug') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { timeout(15) { - sh "./scripts/test-build-config -p $unit -b $suite --compiler=$compiler" + sh './scripts/test-build-config -b Debug --compiler=clang-7' } - + } } - } -} - -def simulationTest(String compiler, String unit, String suite ) { - stage("Coffeelake $compiler $unit $suite") { - node { - checkout scm - - docker.image(OETOOLS_IMAGE).inside { - timeout(15) { - sh "./scripts/test-build-config -p $unit -b $suite --compiler=$compiler" - } + stage('Simulation clang-7 SGX1 Release') { + agent { + docker { + image 'oetools-azure:1.7' } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1 -b Release --compiler=clang-7' + } + } } - } -} - -def nonSimulationTest() { - stage('Non-Simulation Container SGX1-FLC RelWithDebInfo') { - node('hardware') { - checkout scm - - docker.image(OETOOLS_IMAGE).inside('--device /dev/sgx:/dev/sgx') { - timeout(15) { - sh './scripts/test-build-config -p SGX1FLC -b RelWithDebInfo -d' - } + stage('Simulation clang-7 SGX1 RelWithDebInfo') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1 -b RelWithDebInfo --compiler=clang-7' } + } } - } -} - -def checkPreCommitRequirements() { - stage('Check pre-commit requirements') { - node { - checkout scm - - docker.image(OETOOLS_IMAGE).inside { - timeout(2) { - sh './scripts/check-precommit-reqs' - } + stage('Simulation clang-7 SGX1-FLC Debug') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b Debug --compiler=clang-7' } + } } - } - stage('Simulation default compiler') { - // This particular test asserts that everything (at least - // for simulation) can be built after using our - // install-prereqs script to bootstrap a machine. - node { - checkout scm - - def buildImage = docker.build("oetools-base", '-f .jenkins/Dockerfile.scripts .') - - buildImage.inside { - timeout(15) { - // This is run to test that it works with the dependencies - // installed by our install-prereqs script. - sh './scripts/check-precommit-reqs' - - // We actually expect `ctest` to fail because it is an - // older version that emits a failure if any tests are - // skipped. In other stages, we explicitly install an - // updated version of CMake. - dir('build') { - sh ''' - cmake .. - make - OE_SIMULATION=1 ctest --verbose --output-on-failure || true - ''' - // Note that `make package` is not expected to work - // without extra configuration. - } - } + stage('Simulation clang-7 SGX1-FLC Release') { + agent { + docker { + image 'oetools-azure:1.7' } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b Release --compiler=clang-7' + } + } } - } -} - -def windowsDebugCrossPlatform() { - stage('Linux SGX1 Debug') { - node { - docker.image(OETOOLS_IMAGE).inside { + stage('Simulation clang-7 SGX1-FLC RelWithDebInfo') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b RelWithDebInfo --compiler=clang-7' + } + } + } + stage('Coffeelake clang-7 SGX1-FLC Debug') { + agent { + node { + label 'hardware' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b Debug -d --compiler=clang-7' + } + } + } + stage('Coffeelake clang-7 SGX1-FLC Release') { + agent { + node { + label 'hardware' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b Release -d --compiler=clang-7' + } + } + } + stage('Coffeelake clang-7 SGX1-FLC RelWithDebInfo') { + agent { + node { + label 'hardware' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b RelWithDebInfo -d --compiler=clang-7' + } + } + } + stage('Coffeelake gcc SGX1-FLC Debug') { + agent { + node { + label 'hardware' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b Debug -d --compiler=gcc' + } + } + } + stage('Coffeelake gcc SGX1-FLC Release') { + agent { + node { + label 'hardware' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b Release -d --compiler=gcc' + } + } + } + stage('Coffeelake gcc SGX1-FLC RelWithDebInfo') { + agent { + node { + label 'hardware' + } + } + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b RelWithDebInfo -d --compiler=gcc' + } + } + } + stage('Windows Debug Cross-platform') { + stages { + stage('Linux SGX1 Debug') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { timeout(15) { - sh './scripts/test-build-config -p SGX1FLC -b Debug --compiler=clang-7' - stash includes: 'build/tests/**', name: 'linuxdebug' + sh './scripts/test-build-config -p SGX1FLC -b Debug --compiler=clang-7' + stash includes: 'build/tests/**', name: 'linuxdebug' } + } } + stage('Windows Debug') { + agent { + node { + label 'SGXFLC-Windows' + } + } + 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' + } + } + } } - } - stage('Windows Debug') { - node('SGXFLC-Windows') { - unstash 'linuxdebug' - powershell 'mv build linuxbin' - powershell './scripts/test-build-config.ps1 -add_windows_enclave_tests -linux_bin_dir $ENV:WORKSPACE/linuxbin/tests -build_type Debug' - } - } - -} - -def windowsReleaseCrossPlatform() { - stage('Linux SGX1 Release') { - node { - docker.image(OETOOLS_IMAGE).inside { + stage('Windows Release Cross-platform') { + stages { + stage('Linux SGX1 Release') { + agent { + docker { + image 'oetools-azure:1.7' + } + } + steps { timeout(15) { - sh './scripts/test-build-config -p SGX1FLC -b Release --compiler=clang-7' - stash includes: 'build/tests/**', name: 'linuxrelease' + sh './scripts/test-build-config -p SGX1FLC -b Release --compiler=clang-7' + stash includes: 'build/tests/**', name: 'linuxrelease' } + } } + stage('Windows Release') { + agent { + node { + label 'SGXFLC-Windows' + } + } + steps { + unstash 'linuxrelease' + 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 Release && ctest -V -C Release' + } + } + } } - } - stage('Windows Release') { - node('SGXFLC-Windows') { - unstash 'linuxrelease' - powershell 'mv build linuxbin' - powershell './scripts/test-build-config.ps1 -add_windows_enclave_tests -linux_bin_dir $ENV:WORKSPACE/linuxbin/tests -build_type Release' + stage('Non-Simulation Container SGX1-FLC RelWithDebInfo') { + agent { + docker { + image 'oetools-azure:1.7' + label 'hardware' + args '--device /dev/sgx:/dev/sgx' + } + } + + steps { + timeout(15) { + sh './scripts/test-build-config -p SGX1FLC -b RelWithDebInfo -d' + } + } } + } } + } } -parallel "Check Pre-Commit Requirements" : { checkPreCommitRequirements() }, - "Simulation clang-7 SGX1 Debug" : { simulationTest('clang-7', 'SGX1', 'Debug')}, - "Simulation clang-7 SGX1 Release" : { simulationTest('clang-7', 'SGX1', 'Release')}, - "Simulation clang-7 SGX1 RelWithDebInfo" : { simulationTest('clang-7', 'SGX1', 'RelWithDebInfo')}, - "Simulation clang-7 SGX1-FLC Debug" : { simulationTest('clang-7', 'SGX1FLC', 'Debug')}, - "Simulation clang-7 SGX1-FLC Release" : { simulationTest('clang-7', 'SGX1FLC', 'Release')}, - "Simulation clang-7 SGX1-FLC RelWithDebInfo" : { simulationTest('clang-7', 'SGX1FLC', 'RelWithDebInfo')}, - "Coffeelake clang-7 SGX1-FLC Debug" : { coffeelakeTest('clang-7', 'SGX1FLC', 'Debug') }, - "Coffeelake clang-7 SGX1-FLC Release" : { coffeelakeTest('clang-7', 'SGX1FLC','Release') }, - "Coffeelake clang-7 SGX1-FLC RelWithDebInfo" : { coffeelakeTest('clang-7', 'SGX1FLC', 'RelWithDebinfo') }, - "Coffeelake gcc SGX1-FLC Debug" : { coffeelakeTest('gcc', 'SGX1FLC', 'Debug') }, - "Coffeelake gcc SGX1-FLC Release" : { coffeelakeTest('gcc', 'SGX1FLC', 'Release') }, - "Coffeelake gcc SGX1-FLC RelWithDebInfo" : { coffeelakeTest('gcc', 'SGX1FLC', 'RelWithDebInfo') }, - "Windows Debug Cross-platform" : { windowsDebugCrossPlatform() }, - "Windows Release Cross-platform" : { windowsReleaseCrossPlatform() }, - "Non-Simulation Container SGX1-FLC RelWithDebInfo" : { nonSimulationTest() } + diff --git a/enclave/CMakeLists.txt b/enclave/CMakeLists.txt index 83a37d77e6..1ebb3a20c0 100644 --- a/enclave/CMakeLists.txt +++ b/enclave/CMakeLists.txt @@ -26,8 +26,6 @@ add_library(oeenclave STATIC sha.c start.S) -target_compile_options(oeenclave PRIVATE -Wconversion -Wpointer-arith) - if(CMAKE_C_COMPILER_ID MATCHES GNU) target_compile_options(oeenclave PRIVATE -Wjump-misses-init) endif() diff --git a/enclave/core/CMakeLists.txt b/enclave/core/CMakeLists.txt index 91df78dff1..5051ead35b 100644 --- a/enclave/core/CMakeLists.txt +++ b/enclave/core/CMakeLists.txt @@ -51,8 +51,6 @@ target_link_libraries(oecore PUBLIC oe_includes) # This directory contains dummy C headers needed by dlmalloc: target_include_directories(oecore PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dlmalloc) -target_compile_options(oecore PRIVATE -Wconversion -Wpointer-arith) - if (CMAKE_C_COMPILER_ID MATCHES GNU) target_compile_options(oecore PRIVATE -Wjump-misses-init) endif () diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index a9740ffffa..702de6c3b0 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -98,7 +98,7 @@ target_link_libraries(oehost PRIVATE bcrypt Crypt32) endif() if(UNIX) -target_compile_options(oehost PRIVATE -Wno-attributes -Wmissing-prototypes -Wconversion -Wpointer-arith -fPIC -m64) +target_compile_options(oehost PRIVATE -Wno-attributes -Wmissing-prototypes -fPIC -m64) target_compile_definitions(oehost PRIVATE _GNU_SOURCE) endif(UNIX) diff --git a/tests/abortStatus/enc/CMakeLists.txt b/tests/abortStatus/enc/CMakeLists.txt index b46be7ea04..cca7fec0bc 100644 --- a/tests/abortStatus/enc/CMakeLists.txt +++ b/tests/abortStatus/enc/CMakeLists.txt @@ -6,4 +6,3 @@ add_executable(abortStatus_enc enc.cpp) target_compile_features(abortStatus_enc PRIVATE cxx_generalized_initializers) target_link_libraries(abortStatus_enc oelibcxx oeenclave) -target_compile_options(abortStatus_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/abortStatus/host/CMakeLists.txt b/tests/abortStatus/host/CMakeLists.txt index f99eff90c1..3a0852b370 100644 --- a/tests/abortStatus/host/CMakeLists.txt +++ b/tests/abortStatus/host/CMakeLists.txt @@ -4,8 +4,6 @@ add_executable(abortStatus_host host.cpp) target_compile_options(abortStatus_host PRIVATE - -Wconversion - -Wpointer-arith $<$:-std=c++14> ) diff --git a/tests/aesm/CMakeLists.txt b/tests/aesm/CMakeLists.txt index 0e016a7999..559b24337d 100644 --- a/tests/aesm/CMakeLists.txt +++ b/tests/aesm/CMakeLists.txt @@ -8,6 +8,5 @@ target_link_libraries(aesm oehost) if(USE_LIBSGX) target_compile_definitions(aesm PRIVATE OE_USE_LIBSGX) endif() -target_compile_options(aesm PRIVATE -Wconversion -Wpointer-arith) add_test(NAME tests/aesm COMMAND ./aesm) set_tests_properties(tests/aesm PROPERTIES SKIP_RETURN_CODE 2) diff --git a/tests/cppException/enc/CMakeLists.txt b/tests/cppException/enc/CMakeLists.txt index 7fb0e90740..2c72663b1e 100644 --- a/tests/cppException/enc/CMakeLists.txt +++ b/tests/cppException/enc/CMakeLists.txt @@ -14,4 +14,3 @@ if (CMAKE_CXX_COMPILER_ID MATCHES Clang) endif () target_link_libraries(cppException_enc oelibcxx oeenclave) -target_compile_options(cppException_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/cppException/host/CMakeLists.txt b/tests/cppException/host/CMakeLists.txt index 56917bf5d3..ba9ab2e3c5 100644 --- a/tests/cppException/host/CMakeLists.txt +++ b/tests/cppException/host/CMakeLists.txt @@ -3,4 +3,3 @@ add_executable(cppException_host host.cpp) target_link_libraries(cppException_host oehostapp) -target_compile_options(cppException_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/create-rapid/enc/CMakeLists.txt b/tests/create-rapid/enc/CMakeLists.txt index e992cc6c39..d71d53f9b2 100644 --- a/tests/create-rapid/enc/CMakeLists.txt +++ b/tests/create-rapid/enc/CMakeLists.txt @@ -10,4 +10,3 @@ add_executable(create_rapid_enc enc.cpp ${gen}) target_include_directories(create_rapid_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(create_rapid_enc oeenclave) -target_compile_options(create_rapid_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/create-rapid/host/CMakeLists.txt b/tests/create-rapid/host/CMakeLists.txt index d98a858c8e..3aa2634479 100644 --- a/tests/create-rapid/host/CMakeLists.txt +++ b/tests/create-rapid/host/CMakeLists.txt @@ -8,8 +8,6 @@ oeedl_file(../create_rapid.edl host gen) add_executable(create_rapid_host host.cpp ${gen}) target_compile_options(create_rapid_host PRIVATE - -Wconversion - -Wpointer-arith $<$:-std=c++11>) target_include_directories(create_rapid_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/tests/crypto_crls_cert_chains/enc/CMakeLists.txt b/tests/crypto_crls_cert_chains/enc/CMakeLists.txt index 3e64b3dbe2..39d35011fc 100644 --- a/tests/crypto_crls_cert_chains/enc/CMakeLists.txt +++ b/tests/crypto_crls_cert_chains/enc/CMakeLists.txt @@ -5,8 +5,6 @@ include(add_enclave_executable) add_executable(crypto-extra_enc enc.cpp) target_compile_options(crypto-extra_enc PRIVATE - -Wconversion - -Wpointer-arith -std=c++11 ) diff --git a/tests/crypto_crls_cert_chains/host/CMakeLists.txt b/tests/crypto_crls_cert_chains/host/CMakeLists.txt index f483040851..3057011076 100644 --- a/tests/crypto_crls_cert_chains/host/CMakeLists.txt +++ b/tests/crypto_crls_cert_chains/host/CMakeLists.txt @@ -81,8 +81,6 @@ add_custom_command(TARGET crypto-extra_host ) target_compile_options(crypto-extra_host PRIVATE - -Wconversion - -Wpointer-arith -std=c++11 ) diff --git a/tests/debug-mode/enc/CMakeLists.txt b/tests/debug-mode/enc/CMakeLists.txt index b6b3538119..bb94eea123 100644 --- a/tests/debug-mode/enc/CMakeLists.txt +++ b/tests/debug-mode/enc/CMakeLists.txt @@ -13,5 +13,3 @@ add_enclave_executable(debug_enc sign-debug.conf target_link_libraries(no_debug_enc oeenclave) target_link_libraries(debug_enc oeenclave) -target_compile_options(no_debug_enc PRIVATE -Wconversion -Wpointer-arith) -target_compile_options(debug_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/debug-mode/host/CMakeLists.txt b/tests/debug-mode/host/CMakeLists.txt index 879ad0be4c..d2ab65c865 100644 --- a/tests/debug-mode/host/CMakeLists.txt +++ b/tests/debug-mode/host/CMakeLists.txt @@ -4,4 +4,3 @@ add_executable(debug_host host.c) target_link_libraries(debug_host oehostapp) -target_compile_options(debug_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/echo/enc/CMakeLists.txt b/tests/echo/enc/CMakeLists.txt index a6a742fc27..6602ca85a8 100644 --- a/tests/echo/enc/CMakeLists.txt +++ b/tests/echo/enc/CMakeLists.txt @@ -10,4 +10,3 @@ add_executable(echo_enc enc.c ${gen}) target_include_directories(echo_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(echo_enc oeenclave) -target_compile_options(echo_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/echo/host/CMakeLists.txt b/tests/echo/host/CMakeLists.txt index 2029bc51a5..d63a70b53d 100644 --- a/tests/echo/host/CMakeLists.txt +++ b/tests/echo/host/CMakeLists.txt @@ -9,4 +9,3 @@ add_executable(echo_host host.c ${gen}) target_include_directories(echo_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(echo_host oehostapp) -target_compile_options(echo_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/enclaveparam/enc/CMakeLists.txt b/tests/enclaveparam/enc/CMakeLists.txt index ae89699a50..497c532d36 100644 --- a/tests/enclaveparam/enc/CMakeLists.txt +++ b/tests/enclaveparam/enc/CMakeLists.txt @@ -11,4 +11,3 @@ add_executable(enclaveparam_enc enc.c ${gen}) target_include_directories(enclaveparam_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(enclaveparam_enc oeenclave) -target_compile_options(enclaveparam_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/enclaveparam/host/CMakeLists.txt b/tests/enclaveparam/host/CMakeLists.txt index 9e0fd844f8..294a5e71fe 100644 --- a/tests/enclaveparam/host/CMakeLists.txt +++ b/tests/enclaveparam/host/CMakeLists.txt @@ -10,4 +10,3 @@ add_executable(enclaveparam_host host.c ${gen}) target_include_directories(enclaveparam_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(enclaveparam_host oehostapp) -target_compile_options(enclaveparam_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/file/enc/CMakeLists.txt b/tests/file/enc/CMakeLists.txt index 018f8ef87d..9e0e0cff59 100644 --- a/tests/file/enc/CMakeLists.txt +++ b/tests/file/enc/CMakeLists.txt @@ -12,4 +12,3 @@ add_executable(file_enc target_include_directories(file_enc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(file_enc oeenclave) -set_property(SOURCE enc.cpp APPEND_STRING PROPERTY COMPILE_FLAGS "-Wconversion -Wpointer-arith") diff --git a/tests/file/host/CMakeLists.txt b/tests/file/host/CMakeLists.txt index f16c1c82ac..d6cb1285b9 100644 --- a/tests/file/host/CMakeLists.txt +++ b/tests/file/host/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(file_host host.cpp ${gen}) target_include_directories(file_host PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(file_host oehostapp) -set_property(SOURCE host.cpp APPEND_STRING PROPERTY COMPILE_FLAGS "-Wconversion -Wpointer-arith") diff --git a/tests/getenclave/enc/CMakeLists.txt b/tests/getenclave/enc/CMakeLists.txt index 2349895354..6ba1c3201e 100644 --- a/tests/getenclave/enc/CMakeLists.txt +++ b/tests/getenclave/enc/CMakeLists.txt @@ -11,4 +11,3 @@ add_executable(getenclave_enc enc.c ${gen}) target_include_directories(getenclave_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(getenclave_enc oeenclave) -target_compile_options(getenclave_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/getenclave/host/CMakeLists.txt b/tests/getenclave/host/CMakeLists.txt index 148d9a4112..17c3564f2c 100644 --- a/tests/getenclave/host/CMakeLists.txt +++ b/tests/getenclave/host/CMakeLists.txt @@ -10,4 +10,3 @@ add_executable(getenclave_host host.c ${gen}) target_include_directories(getenclave_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(getenclave_host oehostapp) -target_compile_options(getenclave_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/hexdump/enc/CMakeLists.txt b/tests/hexdump/enc/CMakeLists.txt index e9578b764f..6daf7ab354 100644 --- a/tests/hexdump/enc/CMakeLists.txt +++ b/tests/hexdump/enc/CMakeLists.txt @@ -10,4 +10,3 @@ add_executable(hexdump_enc enc.c ${gen}) target_include_directories(hexdump_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(hexdump_enc oeenclave) -target_compile_options(hexdump_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/hexdump/host/CMakeLists.txt b/tests/hexdump/host/CMakeLists.txt index bddf34b3de..de8731fa11 100644 --- a/tests/hexdump/host/CMakeLists.txt +++ b/tests/hexdump/host/CMakeLists.txt @@ -9,4 +9,3 @@ add_executable(hexdump_host host.c ${gen}) target_include_directories(hexdump_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(hexdump_host oehostapp) -target_compile_options(hexdump_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/hostcalls/enc/CMakeLists.txt b/tests/hostcalls/enc/CMakeLists.txt index e0dc71af9f..c4cd5a7107 100644 --- a/tests/hostcalls/enc/CMakeLists.txt +++ b/tests/hostcalls/enc/CMakeLists.txt @@ -10,4 +10,3 @@ add_executable(hostcalls_enc enc.cpp ${gen}) target_include_directories(hostcalls_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(hostcalls_enc oeenclave) -target_compile_options(hostcalls_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/hostcalls/host/CMakeLists.txt b/tests/hostcalls/host/CMakeLists.txt index 94339c8fe2..9ff0fdf840 100644 --- a/tests/hostcalls/host/CMakeLists.txt +++ b/tests/hostcalls/host/CMakeLists.txt @@ -9,4 +9,3 @@ add_executable(hostcalls_host host.cpp ${gen}) target_include_directories(hostcalls_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(hostcalls_host oehostapp) -target_compile_options(hostcalls_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/initializers/enc/CMakeLists.txt b/tests/initializers/enc/CMakeLists.txt index a728a5711c..2d5a01e592 100644 --- a/tests/initializers/enc/CMakeLists.txt +++ b/tests/initializers/enc/CMakeLists.txt @@ -9,4 +9,3 @@ add_executable(initializers_enc enc.c ${gen}) target_include_directories(initializers_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(initializers_enc oeenclave) -target_compile_options(initializers_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/initializers/host/CMakeLists.txt b/tests/initializers/host/CMakeLists.txt index 2464207632..08f222cdc8 100644 --- a/tests/initializers/host/CMakeLists.txt +++ b/tests/initializers/host/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(initializers_host host.cpp ${gen}) target_include_directories(initializers_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(initializers_host oehostapp) -target_compile_options(initializers_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/mbed/host/CMakeLists.txt b/tests/mbed/host/CMakeLists.txt index e72d2583bf..ea99585322 100644 --- a/tests/mbed/host/CMakeLists.txt +++ b/tests/mbed/host/CMakeLists.txt @@ -7,7 +7,7 @@ oeedl_file(../mbed.edl host gen) add_executable(libmbedtest_host host.c ocalls.c ${gen}) -target_compile_options(libmbedtest_host PRIVATE -Wno-error -Wconversion -Wpointer-arith) +target_compile_options(libmbedtest_host PRIVATE -Wno-error) target_include_directories(libmbedtest_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(libmbedtest_host oehostapp) diff --git a/tests/mem/CMakeLists.txt b/tests/mem/CMakeLists.txt index 733ca79399..e72861b4c2 100644 --- a/tests/mem/CMakeLists.txt +++ b/tests/mem/CMakeLists.txt @@ -3,6 +3,5 @@ add_executable(mem main.c) target_link_libraries(mem oehost) -target_compile_options(mem PRIVATE -Wconversion -Wpointer-arith) add_test(tests/mem mem) diff --git a/tests/mixed_c_cpp/enc/CMakeLists.txt b/tests/mixed_c_cpp/enc/CMakeLists.txt index da09bf0195..68be15b530 100644 --- a/tests/mixed_c_cpp/enc/CMakeLists.txt +++ b/tests/mixed_c_cpp/enc/CMakeLists.txt @@ -13,4 +13,3 @@ add_executable(mixed_c_cpp_enc target_include_directories(mixed_c_cpp_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(mixed_c_cpp_enc oelibcxx oeenclave) -target_compile_options(mixed_c_cpp_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/mixed_c_cpp/host/CMakeLists.txt b/tests/mixed_c_cpp/host/CMakeLists.txt index 50b1771f1e..957ecedb64 100644 --- a/tests/mixed_c_cpp/host/CMakeLists.txt +++ b/tests/mixed_c_cpp/host/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(mixed_c_cpp_host host.cpp ${gen}) target_include_directories(mixed_c_cpp_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(mixed_c_cpp_host oehostapp) -target_compile_options(mixed_c_cpp_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/ocall-create/enc/CMakeLists.txt b/tests/ocall-create/enc/CMakeLists.txt index 2be00451c2..ff4c2c8cb7 100644 --- a/tests/ocall-create/enc/CMakeLists.txt +++ b/tests/ocall-create/enc/CMakeLists.txt @@ -4,4 +4,3 @@ include(add_enclave_executable) add_executable(ocall_create_enc enc.c) target_link_libraries(ocall_create_enc oeenclave) -target_compile_options(ocall_create_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/ocall-create/host/CMakeLists.txt b/tests/ocall-create/host/CMakeLists.txt index 697d5d367f..0507b7db21 100644 --- a/tests/ocall-create/host/CMakeLists.txt +++ b/tests/ocall-create/host/CMakeLists.txt @@ -3,4 +3,3 @@ add_executable(ocall_create_host host.c) target_link_libraries(ocall_create_host oehostapp) -target_compile_options(ocall_create_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/ocall/enc/CMakeLists.txt b/tests/ocall/enc/CMakeLists.txt index 5fdf36c844..fa4ad64c7a 100644 --- a/tests/ocall/enc/CMakeLists.txt +++ b/tests/ocall/enc/CMakeLists.txt @@ -4,4 +4,3 @@ include(add_enclave_executable) add_executable(ocall_enc enc.cpp) target_link_libraries(ocall_enc oeenclave) -target_compile_options(ocall_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/ocall/host/CMakeLists.txt b/tests/ocall/host/CMakeLists.txt index 799c863d84..cd496d0375 100644 --- a/tests/ocall/host/CMakeLists.txt +++ b/tests/ocall/host/CMakeLists.txt @@ -4,5 +4,3 @@ add_executable(ocall_host host.cpp) target_link_libraries(ocall_host oehostapp) -target_compile_options(ocall_host PRIVATE -Wconversion -Wpointer-arith) - diff --git a/tests/oeedger8r/edl/basic.edl b/tests/oeedger8r/edl/basic.edl index 763a9b3f76..c5de26a245 100644 --- a/tests/oeedger8r/edl/basic.edl +++ b/tests/oeedger8r/edl/basic.edl @@ -33,8 +33,7 @@ enclave { long long arg16, unsigned char arg17, unsigned short arg18, - unsigned int arg19, - unsigned long arg20 + unsigned int arg19 ); public void ecall_basic_non_portable_types( @@ -98,8 +97,7 @@ enclave { long long arg16, unsigned char arg17, unsigned short arg18, - unsigned int arg19, - unsigned long arg20 + unsigned int arg19 ); void ocall_basic_non_portable_types( diff --git a/tests/oeedger8r/enc/CMakeLists.txt b/tests/oeedger8r/enc/CMakeLists.txt index eb8c3bb792..7b2575b649 100644 --- a/tests/oeedger8r/enc/CMakeLists.txt +++ b/tests/oeedger8r/enc/CMakeLists.txt @@ -33,8 +33,6 @@ add_executable(edl_enc target_include_directories(edl_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..) -set_property(SOURCE ${edl_src} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wconversion -Wpointer-arith") - set_property( TARGET edl_enc PROPERTY CXX_STANDARD 11 diff --git a/tests/oeedger8r/enc/testbasic.cpp b/tests/oeedger8r/enc/testbasic.cpp index 6bfc9a8851..a456c61391 100644 --- a/tests/oeedger8r/enc/testbasic.cpp +++ b/tests/oeedger8r/enc/testbasic.cpp @@ -30,8 +30,7 @@ void test_basic_edl_ocalls() 18, 255, 19, - 20, - 21) == OE_OK); + 20) == OE_OK); { char ret = 0; @@ -147,18 +146,12 @@ void test_basic_edl_ocalls() OE_TEST(ret == 202); } - { - unsigned long ret = 0; - OE_TEST(ocall_ret_unsigned_long(&ret) == OE_OK); - OE_TEST(ret == 212121); - } - { OE_TEST(ocall_ret_void() == OE_OK); } if (g_enabled[TYPE_WCHAR_T] && g_enabled[TYPE_LONG] && - g_enabled[TYPE_LONG_DOUBLE]) + g_enabled[TYPE_UNSIGNED_LONG] && g_enabled[TYPE_LONG_DOUBLE]) { OE_TEST( ocall_basic_non_portable_types( @@ -180,6 +173,13 @@ void test_basic_edl_ocalls() OE_TEST(ret == 777); } + if (g_enabled[TYPE_UNSIGNED_LONG]) + { + unsigned long ret = 0; + OE_TEST(ocall_ret_unsigned_long(&ret) == OE_OK); + OE_TEST(ret == 212121); + } + if (g_enabled[TYPE_LONG_DOUBLE]) { long double ret = 0; @@ -209,8 +209,7 @@ void ecall_basic_types( long long arg16, unsigned char arg17, unsigned short arg18, - unsigned int arg19, - unsigned long arg20) + unsigned int arg19) { ecall_basic_types_args_t args; @@ -234,7 +233,6 @@ void ecall_basic_types( check_type(args.arg17); check_type(args.arg18); check_type(args.arg19); - check_type(args.arg20); OE_TEST(arg1 == '?'); OE_TEST(arg2 = 3); @@ -255,7 +253,6 @@ void ecall_basic_types( OE_TEST(arg17 = 255); OE_TEST(arg18 = 19); OE_TEST(arg19 = 20); - OE_TEST(arg20 = 21); } void ecall_basic_non_portable_types( diff --git a/tests/oeedger8r/host/CMakeLists.txt b/tests/oeedger8r/host/CMakeLists.txt index 717f7bc89d..186797530d 100644 --- a/tests/oeedger8r/host/CMakeLists.txt +++ b/tests/oeedger8r/host/CMakeLists.txt @@ -34,8 +34,6 @@ add_executable(edl_host target_include_directories(edl_host PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..) -set_property(SOURCE ${edl_src} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wconversion -Wpointer-arith") - set_property( TARGET edl_host PROPERTY CXX_STANDARD 11 diff --git a/tests/oeedger8r/host/testbasic.cpp b/tests/oeedger8r/host/testbasic.cpp index bf60115956..331fd23566 100644 --- a/tests/oeedger8r/host/testbasic.cpp +++ b/tests/oeedger8r/host/testbasic.cpp @@ -31,8 +31,7 @@ void test_basic_edl_ecalls(oe_enclave_t* enclave) 18, 255, 19, - 20, - 21) == OE_OK); + 20) == OE_OK); { char ret = 0; @@ -148,18 +147,12 @@ void test_basic_edl_ecalls(oe_enclave_t* enclave) OE_TEST(ret == 202); } - { - unsigned long ret = 0; - OE_TEST(ecall_ret_unsigned_long(enclave, &ret) == OE_OK); - OE_TEST(ret == 212121); - } - { OE_TEST(ecall_ret_void(enclave) == OE_OK); } if (g_enabled[TYPE_WCHAR_T] && g_enabled[TYPE_LONG] && - g_enabled[TYPE_LONG_DOUBLE]) + g_enabled[TYPE_UNSIGNED_LONG] && g_enabled[TYPE_LONG_DOUBLE]) { OE_TEST( ecall_basic_non_portable_types( @@ -184,6 +177,13 @@ void test_basic_edl_ecalls(oe_enclave_t* enclave) OE_TEST(ret == 777); } + if (g_enabled[TYPE_UNSIGNED_LONG]) + { + unsigned long ret = 0; + OE_TEST(ecall_ret_unsigned_long(enclave, &ret) == OE_OK); + OE_TEST(ret == 212121); + } + if (g_enabled[TYPE_LONG_DOUBLE]) { long double ret = 0; @@ -213,8 +213,7 @@ void ocall_basic_types( long long arg16, unsigned char arg17, unsigned short arg18, - unsigned int arg19, - unsigned long arg20) + unsigned int arg19) { ocall_basic_types_args_t args; @@ -238,7 +237,6 @@ void ocall_basic_types( check_type(args.arg17); check_type(args.arg18); check_type(args.arg19); - check_type(args.arg20); OE_TEST(arg1 == '?'); OE_TEST(arg2 = 3); @@ -258,8 +256,6 @@ void ocall_basic_types( OE_TEST(arg16 = 18); OE_TEST(arg17 = 255); OE_TEST(arg18 = 19); - OE_TEST(arg19 = 20); - OE_TEST(arg20 = 21); } void ocall_basic_non_portable_types( diff --git a/tests/pingpong-shared/enc/CMakeLists.txt b/tests/pingpong-shared/enc/CMakeLists.txt index d1e49154f0..e9eedc0d31 100644 --- a/tests/pingpong-shared/enc/CMakeLists.txt +++ b/tests/pingpong-shared/enc/CMakeLists.txt @@ -12,4 +12,3 @@ add_executable(pingpong-shared_enc target_include_directories(pingpong-shared_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(pingpong-shared_enc oelibc oeenclave) -target_compile_options(pingpong-shared_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/pingpong-shared/host/CMakeLists.txt b/tests/pingpong-shared/host/CMakeLists.txt index 1f961a16c3..a01ce09eee 100644 --- a/tests/pingpong-shared/host/CMakeLists.txt +++ b/tests/pingpong-shared/host/CMakeLists.txt @@ -11,5 +11,4 @@ target_link_libraries(pingpong-shared-lib oehostapp) add_executable(pingpong-shared_host main.cpp) target_link_libraries(pingpong-shared_host pingpong-shared-lib) -target_compile_options(pingpong-shared_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/pingpong/enc/CMakeLists.txt b/tests/pingpong/enc/CMakeLists.txt index cf3bef1a12..33b547a5b4 100644 --- a/tests/pingpong/enc/CMakeLists.txt +++ b/tests/pingpong/enc/CMakeLists.txt @@ -12,4 +12,3 @@ add_executable(pingpong_enc target_include_directories(pingpong_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(pingpong_enc oeenclave) -target_compile_options(pingpong_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/pingpong/host/CMakeLists.txt b/tests/pingpong/host/CMakeLists.txt index 6b3edfeb9f..adf98750da 100644 --- a/tests/pingpong/host/CMakeLists.txt +++ b/tests/pingpong/host/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(pingpong_host host.cpp ${gen}) target_include_directories(pingpong_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(pingpong_host oehostapp) -target_compile_options(pingpong_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/print/enc/CMakeLists.txt b/tests/print/enc/CMakeLists.txt index f171b2a618..ecaac320df 100644 --- a/tests/print/enc/CMakeLists.txt +++ b/tests/print/enc/CMakeLists.txt @@ -13,8 +13,6 @@ target_compile_options(print_enc PRIVATE -fno-builtin-strcat -fno-builtin-memcpy -fno-builtin-memset - -Wconversion - -Wpointer-arith ) if (CMAKE_C_COMPILER_ID MATCHES GNU) diff --git a/tests/print/host/CMakeLists.txt b/tests/print/host/CMakeLists.txt index a044585b6c..9e4c939763 100644 --- a/tests/print/host/CMakeLists.txt +++ b/tests/print/host/CMakeLists.txt @@ -9,4 +9,3 @@ add_executable(print_host host.cpp ${gen}) target_include_directories(print_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(print_host oehostapp) -target_compile_options(print_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/props/enc/CMakeLists.txt b/tests/props/enc/CMakeLists.txt index 6691b41e5c..6275ccedb8 100644 --- a/tests/props/enc/CMakeLists.txt +++ b/tests/props/enc/CMakeLists.txt @@ -10,4 +10,3 @@ add_enclave_executable(props_enc sign.conf enc.c props.c ${gen}) target_include_directories(props_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(props_enc oeenclave) -target_compile_options(props_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/props/host/CMakeLists.txt b/tests/props/host/CMakeLists.txt index 5fe7658641..cd8a725c03 100644 --- a/tests/props/host/CMakeLists.txt +++ b/tests/props/host/CMakeLists.txt @@ -9,4 +9,3 @@ add_executable(props_host host.c ${gen}) target_include_directories(props_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(props_host oehostapp) -target_compile_options(props_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/safecrt/enc/CMakeLists.txt b/tests/safecrt/enc/CMakeLists.txt index acae49e664..3f08459284 100644 --- a/tests/safecrt/enc/CMakeLists.txt +++ b/tests/safecrt/enc/CMakeLists.txt @@ -14,4 +14,3 @@ add_executable(safecrt_enc target_include_directories(safecrt_enc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(safecrt_enc oelibcxx oeenclave) -set_property(SOURCE ../common/test.cpp enc.cpp APPEND_STRING PROPERTY "-Wconversion -Wpointer-arith") diff --git a/tests/safecrt/host/CMakeLists.txt b/tests/safecrt/host/CMakeLists.txt index 59747157af..dc4d76ca64 100644 --- a/tests/safecrt/host/CMakeLists.txt +++ b/tests/safecrt/host/CMakeLists.txt @@ -13,4 +13,3 @@ add_executable(safecrt_host target_include_directories(safecrt_host PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(safecrt_host oehostapp) -set_property(SOURCE ../common/test.cpp host.cpp APPEND_STRING PROPERTY "-Wconversion -Wpointer-arith") diff --git a/tests/stdcxx/enc/CMakeLists.txt b/tests/stdcxx/enc/CMakeLists.txt index 5edb4a18f1..69683b6b3c 100644 --- a/tests/stdcxx/enc/CMakeLists.txt +++ b/tests/stdcxx/enc/CMakeLists.txt @@ -12,8 +12,6 @@ target_compile_options(stdcxx_enc PRIVATE -fno-builtin-fprintf -fno-builtin-printf -std=c++14 - -Wconversion - -Wpointer-arith ) target_link_libraries(stdcxx_enc oelibcxx oeenclave) diff --git a/tests/stdcxx/host/CMakeLists.txt b/tests/stdcxx/host/CMakeLists.txt index 76880f1375..f7461f0e9d 100644 --- a/tests/stdcxx/host/CMakeLists.txt +++ b/tests/stdcxx/host/CMakeLists.txt @@ -3,4 +3,3 @@ add_executable(stdcxx_host host.cpp) target_link_libraries(stdcxx_host oehostapp) -target_compile_options(stdcxx_host PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/str/CMakeLists.txt b/tests/str/CMakeLists.txt index f68802fdad..91d7c33391 100644 --- a/tests/str/CMakeLists.txt +++ b/tests/str/CMakeLists.txt @@ -3,6 +3,5 @@ add_executable(str main.c) target_link_libraries(str oehost) -target_compile_options(str PRIVATE -Wconversion -Wpointer-arith) add_test(NAME tests/str COMMAND str WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/tests/thread/host/CMakeLists.txt b/tests/thread/host/CMakeLists.txt index 2a1ce79478..4264ab2455 100644 --- a/tests/thread/host/CMakeLists.txt +++ b/tests/thread/host/CMakeLists.txt @@ -3,7 +3,5 @@ add_executable(thread_host host.cpp rwlocks_test_host.cpp) target_compile_options(thread_host PRIVATE - -Wconversion - -Wpointer-arith --std=c++11) target_link_libraries(thread_host oehostapp) diff --git a/tests/thread/oethread_enc/CMakeLists.txt b/tests/thread/oethread_enc/CMakeLists.txt index fdaade80e9..0f0bbbadd3 100644 --- a/tests/thread/oethread_enc/CMakeLists.txt +++ b/tests/thread/oethread_enc/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(oethread_enc rwlock_tests.cpp) target_link_libraries(oethread_enc oelibcxx oeenclave) -target_compile_options(oethread_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/thread/pthread_enc/CMakeLists.txt b/tests/thread/pthread_enc/CMakeLists.txt index 34d1056974..45c8aa0892 100644 --- a/tests/thread/pthread_enc/CMakeLists.txt +++ b/tests/thread/pthread_enc/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(pthread_enc rwlock_tests.cpp) target_link_libraries(pthread_enc oelibcxx oeenclave) -target_compile_options(pthread_enc PRIVATE -Wconversion -Wpointer-arith) diff --git a/tests/threadcxx/enc/CMakeLists.txt b/tests/threadcxx/enc/CMakeLists.txt index 041c86eaf9..5bf2544fe9 100644 --- a/tests/threadcxx/enc/CMakeLists.txt +++ b/tests/threadcxx/enc/CMakeLists.txt @@ -4,7 +4,5 @@ include(add_enclave_executable) add_executable(threadcxx_enc enc.cpp cond_tests.cpp) target_compile_options(threadcxx_enc PRIVATE - -Wconversion - -Wpointer-arith --std=c++11) target_link_libraries(threadcxx_enc oelibcxx oeenclave) diff --git a/tests/threadcxx/host/CMakeLists.txt b/tests/threadcxx/host/CMakeLists.txt index e045939dd8..cae6014a66 100644 --- a/tests/threadcxx/host/CMakeLists.txt +++ b/tests/threadcxx/host/CMakeLists.txt @@ -3,7 +3,5 @@ add_executable(threadcxx_host host.cpp) target_compile_options(threadcxx_host PRIVATE - -Wconversion - -Wpointer-arith --std=c++11) target_link_libraries(threadcxx_host oehostapp)