Skip to content

Commit

Permalink
Enable CI wasi test suite for x86-32 classic/fast interpreter (byteco…
Browse files Browse the repository at this point in the history
…dealliance#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.
  • Loading branch information
wenyongh authored Jan 6, 2023
1 parent 7401718 commit 1f4580f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/compilation_on_android_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,8 @@ jobs:

- name: set env variable(if x86_32 test needed)
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'
run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV

Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/aot/aot_runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ check_linked_symbol(AOTModule *module, char *error_buf, uint32 error_buf_size)
AOTImportGlobal *global = module->import_globals + i;
if (!global->is_linked) {
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);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/interpreter/wasm_runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ check_linked_symbol(WASMModuleInstance *module_inst, char *error_buf,
#else
#if WASM_ENABLE_WAMR_COMPILER == 0
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);
return false;
#else
Expand Down

0 comments on commit 1f4580f

Please sign in to comment.