diff --git a/test/aottest/BUILD.gn b/test/aottest/BUILD.gn index 58933b5441e8b0996dc9343ea92750f5a764da2f..9411da17ee64f0a15da3770cd5dee4d0f794a543 100644 --- a/test/aottest/BUILD.gn +++ b/test/aottest/BUILD.gn @@ -14,39 +14,39 @@ group("ark_aot_test") { testonly = true deps = [ - "add:addAction", - "and:andAction", - "ashr:ashrAction", - "createemptyarray:createemptyarrayAction", - "createemptyobject:createemptyobjectAction", - "dec:decAction", - "definefunc:definefuncAction", - "delobjprop:delobjpropAction", - "div:divAction", - "exp:expAction", - "helloaot:helloaotAction", - "inc:incAction", - "ldfunctionpref:ldfunctionprefAction", - "ldglobalvar:ldglobalvarAction", - "logic_op:logic_opAction", - "mod:modAction", - "mul:mulAction", - "neg:negAction", - "not:notAction", - "or:orAction", - "shl:shlAction", - "shr:shrAction", - "stconsttoglobalrecord:stconsttoglobalrecordAction", - "stglobalvar:stglobalvarAction", - "stlettoglobalrecord:stlettoglobalrecordAction", - "stobjbyname:stobjbynameAction", - "strictequal:strictequalAction", - "strictnotequal:strictnotequalAction", - "sub:subAction", - "throw:throwAction", - "tonumber:tonumberAction", - "trystglobalbynameprefid32:trystglobalbynameprefid32Action", - "typeof:typeofAction", - "xor:xorAction", + "add:addAotAction", + "and:andAotAction", + "ashr:ashrAotAction", + "createemptyarray:createemptyarrayAotAction", + "createemptyobject:createemptyobjectAotAction", + "dec:decAotAction", + "definefunc:definefuncAotAction", + "delobjprop:delobjpropAotAction", + "div:divAotAction", + "exp:expAotAction", + "helloaot:helloaotAotAction", + "inc:incAotAction", + "ldfunctionpref:ldfunctionprefAotAction", + "ldglobalvar:ldglobalvarAotAction", + "logic_op:logic_opAotAction", + "mod:modAotAction", + "mul:mulAotAction", + "neg:negAotAction", + "not:notAotAction", + "or:orAotAction", + "shl:shlAotAction", + "shr:shrAotAction", + "stconsttoglobalrecord:stconsttoglobalrecordAotAction", + "stglobalvar:stglobalvarAotAction", + "stlettoglobalrecord:stlettoglobalrecordAotAction", + "stobjbyname:stobjbynameAotAction", + "strictequal:strictequalAotAction", + "strictnotequal:strictnotequalAotAction", + "sub:subAotAction", + "throw:throwAotAction", + "tonumber:tonumberAotAction", + "trystglobalbynameprefid32:trystglobalbynameprefid32AotAction", + "typeof:typeofAotAction", + "xor:xorAotAction", ] } diff --git a/test/test_helper.gni b/test/test_helper.gni index 3076de757953162f98a12d1c7490f342fb13d086..1f25f865aef3ff90dfb318c738f30d2664dcc403 100644 --- a/test/test_helper.gni +++ b/test/test_helper.gni @@ -182,7 +182,11 @@ template("host_aot_test_action") { _script_args_ = rebase_path(_test_abc_path_) - action("genStubAction") { + _stub_out_path_options_ = + " --com-stub-out=" + rebase_path(target_out_dir) + + "/com_stub.m --bc-stub-out=" + rebase_path(target_out_dir) + "/bc_stub.m" + + action("gen${_target_name_}StubAction") { testonly = true _host_stub_target_ = "//ark/js_runtime/ecmascript/compiler:ark_stub_compiler(${host_toolchain})" @@ -192,15 +196,11 @@ template("host_aot_test_action") { script = "//ark/js_runtime/test/run_ark_executable.py" - _stub_compile_options_ = " --com-stub-out=" + rebase_path(target_out_dir) + - "/com_stub.m --bc-stub-out=" + - rebase_path(target_out_dir) + "/bc_stub.m" - args = [ "--script-file", rebase_path(_root_out_dir_) + "/ark/ark_js_runtime/ark_stub_compiler", "--script-options", - _stub_compile_options_, + _stub_out_path_options_, "--expect-sub-output", "stub compiler run finish, result condition(T/F):true", "--env-path", @@ -251,7 +251,7 @@ template("host_aot_test_action") { outputs = [ "$target_out_dir/${_target_name_}/compile_${_target_name_}/" ] } - action("${_target_name_}Action") { + action("${_target_name_}AotAction") { testonly = true _host_jsvm_target_ = @@ -259,7 +259,7 @@ template("host_aot_test_action") { _root_out_dir_ = get_label_info(_host_jsvm_target_, "root_out_dir") deps = [ ":${_target_name_}AotCompileAction", - ":genStubAction", + ":gen${_target_name_}StubAction", ":gen_${_target_name_}_abc", _host_jsvm_target_, ] @@ -270,7 +270,8 @@ template("host_aot_test_action") { _aot_run_options_ = " --aot-output-file=" + rebase_path(_test_m_path_) + " --snapshot-output-file=" + rebase_path(_test_snapshot_path_) + - " --enable-ts-aot=true" + " --enable-stub-aot=true" + " --asmInter=1" + " --enable-ts-aot=true" + " --enable-stub-aot=true" + " --asmInter=1" + + _stub_out_path_options_ args = [ "--script-file",