Set default enclave type by env var, not Python arg (#1091)

Co-authored-by: Julien Maffre <42961061+jumaffre@users.noreply.github.com>

cmake/common.cmake

@@ -119,10 +119,10 @@ if("sgx" IN_LIST COMPILE_TARGETS)
   endif()
 
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(TEST_ENCLAVE_TYPE -e debug)
+    set(DEFAULT_ENCLAVE_TYPE debug)
   endif()
 else()
-  set(TEST_ENCLAVE_TYPE -e virtual)
+  set(DEFAULT_ENCLAVE_TYPE virtual)
 endif()
 
 # Lua module
@@ -312,13 +312,8 @@ set(WORKER_THREADS
 )
 
 set(CCF_NETWORK_TEST_ARGS
-    ${TEST_ENCLAVE_TYPE}
-    -l
-    ${TEST_HOST_LOGGING_LEVEL}
-    -g
-    ${CCF_DIR}/src/runtime_config/gov.lua
-    --worker-threads
-    ${WORKER_THREADS}
+    -l ${TEST_HOST_LOGGING_LEVEL} -g ${CCF_DIR}/src/runtime_config/gov.lua
+    --worker-threads ${WORKER_THREADS}
 )
 
 # SNIPPET_START: Lua generic application
@@ -402,6 +397,11 @@ function(add_e2e_test)
     set_property(
       TEST ${PARSED_ARGS_NAME} APPEND PROPERTY LABELS ${PARSED_ARGS_CONSENSUS}
     )
+
+    set_property(
+      TEST ${PARSED_ARGS_NAME} APPEND
+      PROPERTY ENVIRONMENT "DEFAULT_ENCLAVE_TYPE=${DEFAULT_ENCLAVE_TYPE}"
+    )
   endif()
 endfunction()
 

tests/infra/e2e_args.py

@@ -35,7 +35,7 @@ def cli_args(add=lambda x: None, parser=None, accept_unknown=False):
         "-e",
         "--enclave-type",
         help="Enclave type",
-        default=os.getenv("TEST_ENCLAVE", "release"),
+        default=os.getenv("TEST_ENCLAVE", os.getenv("DEFAULT_ENCLAVE_TYPE", "release")),
         choices=("release", "debug", "virtual"),
     )
     parser.add_argument(