Fix issue with enable e2e test without provisioning client (#748)

* Fix issue when using e2e test with edge modules and not using provisioning client; there was an compiler failure
Azure · Nov 30, 2018 · 9650148 · 9650148
1 parent 03416b6
commit 9650148
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -313,7 +313,7 @@ if (${use_prov_client_core})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PROV_MODULE")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_PROV_MODULE")
 
-    if (${build_provisioning_service_client})
+    if (${build_provisioning_service_client} AND ${use_prov_client})
         add_subdirectory(provisioning_service_client)
     endif()
 

diff --git a/jenkins/linux_c_option_test.sh b/jenkins/linux_c_option_test.sh
@@ -55,6 +55,7 @@ declare -a arr=(
     "-Dbuild_as_dynamic:BOOL=ON -Ddont_use_uploadtoblob:BOOL=ON -Duse_edge_modules:BOOL=ON"
     "-Drun_longhaul_tests=ON"
     "-Duse_prov_client=ON -Dhsm_custom_lib=$custom_hsm_lib"
+    "-Drun_e2e_tests=ON -Drun_sfc_tests=ON -Duse_edge_modules=ON"
 )
 
 for item in "${arr[@]}"

diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt
@@ -39,7 +39,7 @@ if (${hsm_type_custom})
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_AUTH_TYPE_CUSTOM")
 
     set(HSM_CLIENT_LIBRARY ${CUSTOM_HSM_LIB})
-else ()
+elseif (${use_prov_client})
     if (${run_e2e_tests})
         # For e2e test we need to run a custom HSM to handle testing
         if (${hsm_type_x509})