In SGX mode, disable WASI during the SPEC TEST

Author: lum1n0us

.gitignore

@@ -4,6 +4,10 @@
 /.idea
 **/cmake-build-*/
 **/*build/
+*.obj
+*.a
+*.so
+
 core/deps/**
 core/shared/mem-alloc/tlsf
 core/app-framework/wgl
@@ -12,6 +16,9 @@ wamr-sdk/out/
 wamr-sdk/runtime/build_runtime_sdk/
 test-tools/host-tool/bin/
 product-mini/app-samples/hello-world/test.wasm
+product-mini/platforms/linux-sgx/enclave-sample/App/
+product-mini/platforms/linux-sgx/enclave-sample/Enclave/
+product-mini/platforms/linux-sgx/enclave-sample/iwasm
 
 build_out
 tests/wamr-test-suites/workspace

core/iwasm/common/wasm_runtime_common.c

@@ -1183,7 +1183,7 @@ wasm_runtime_get_function_type(const WASMFunctionInstanceCommon *function,
 }
 
 WASMFunctionInstanceCommon *
-wasm_runtime_lookup_function(WASMModuleInstanceCommon *const module_inst,
+wasm_runtime_lookup_function(WASMModuleInstanceCommon *module_inst,
                              const char *name, const char *signature)
 {
 #if WASM_ENABLE_INTERP != 0

core/iwasm/common/wasm_runtime_common.h

@@ -447,7 +447,7 @@ wasm_runtime_deinstantiate(WASMModuleInstanceCommon *module_inst);
 
 /* See wasm_export.h for description */
 WASM_RUNTIME_API_EXTERN WASMFunctionInstanceCommon *
-wasm_runtime_lookup_function(WASMModuleInstanceCommon *const module_inst,
+wasm_runtime_lookup_function(WASMModuleInstanceCommon *module_inst,
                              const char *name, const char *signature);
 
 /* Internal API */

core/iwasm/include/wasm_export.h

@@ -395,7 +395,7 @@ wasm_runtime_lookup_wasi_start_function(wasm_module_inst_t module_inst);
  * @return the function instance found, NULL if not found
  */
 WASM_RUNTIME_API_EXTERN wasm_function_inst_t
-wasm_runtime_lookup_function(wasm_module_inst_t const module_inst,
+wasm_runtime_lookup_function(wasm_module_inst_t module_inst,
                              const char *name, const char *signature);
 
 /**

product-mini/platforms/linux-sgx/enclave-sample/Makefile

@@ -102,6 +102,7 @@ Enclave_Include_Paths := -IEnclave -I$(WAMR_ROOT)/core/iwasm/include \
 Enclave_C_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(Enclave_Include_Paths)
 ifeq ($(SPEC_TEST), 1)
 	Enclave_C_Flags += -DWASM_ENABLE_SPEC_TEST=1
+	Enclave_C_Flags += -DSGX_DISABLE_WASI
 else
 	Enclave_C_Flags += -DWASM_ENABLE_SPEC_TEST=0
 endif