소스 검색

Enable CI wasi test suite for x86-32 classic/fast interpreter (#1866)

The original CI didn't actually run wasi test suite for x86-32 since the `TEST_ON_X86_32=true`
isn't written into $GITHUB_ENV.

And refine the error output when failed to link import global.
Wenyong Huang 3 년 전
부모
커밋
1f4580fbd8
3개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 1
      .github/workflows/compilation_on_android_ubuntu.yml
  2. 1 1
      core/iwasm/aot/aot_runtime.c
  3. 1 1
      core/iwasm/interpreter/wasm_runtime.c

+ 2 - 1
.github/workflows/compilation_on_android_ubuntu.yml

@@ -424,7 +424,8 @@ jobs:
 
 
       - name: set env variable(if x86_32 test needed)
       - name: set env variable(if x86_32 test needed)
         if: >
         if: >
-          (matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS')
+          (matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS'
+           || matrix.test_option == '$WASI_TEST_OPTIONS')
           && matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit'
           && matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit'
         run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV
         run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV
 
 

+ 1 - 1
core/iwasm/aot/aot_runtime.c

@@ -987,7 +987,7 @@ check_linked_symbol(AOTModule *module, char *error_buf, uint32 error_buf_size)
         AOTImportGlobal *global = module->import_globals + i;
         AOTImportGlobal *global = module->import_globals + i;
         if (!global->is_linked) {
         if (!global->is_linked) {
             set_error_buf_v(error_buf, error_buf_size,
             set_error_buf_v(error_buf, error_buf_size,
-                            "warning: failed to link import global (%s, %s)",
+                            "failed to link import global (%s, %s)",
                             global->module_name, global->global_name);
                             global->module_name, global->global_name);
             return false;
             return false;
         }
         }

+ 1 - 1
core/iwasm/interpreter/wasm_runtime.c

@@ -1252,7 +1252,7 @@ check_linked_symbol(WASMModuleInstance *module_inst, char *error_buf,
 #else
 #else
 #if WASM_ENABLE_WAMR_COMPILER == 0
 #if WASM_ENABLE_WAMR_COMPILER == 0
             set_error_buf_v(error_buf, error_buf_size,
             set_error_buf_v(error_buf, error_buf_size,
-                            "warning: failed to link import global (%s, %s)",
+                            "failed to link import global (%s, %s)",
                             global->module_name, global->field_name);
                             global->module_name, global->field_name);
             return false;
             return false;
 #else
 #else