From ada88afd825f59be745c6273bc80479d6b880871 Mon Sep 17 00:00:00 2001 From: luozhewen Date: Mon, 30 Aug 2021 09:49:39 +0000 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81JS=E7=94=A8=E4=BE=8B=E6=BA=90?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=AF=91=E6=88=90hap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: luozhewen --- build/suite.gni | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/build/suite.gni b/build/suite.gni index e6a7636..0a565d7 100755 --- a/build/suite.gni +++ b/build/suite.gni @@ -101,11 +101,6 @@ template("ohos_testsuite_base") { final_hap_path = _final_hap_path testonly = true } - } else if (_project_type == "js_test_hap") { - _hap_name = invoker.test_hap_name - _archive_filename = "${_hap_name}.hap" - _output_file = invoker.hap_source_path - _archive_filename = "${_hap_name}.hap" } else if (_project_type == "pythontest") { if (defined(invoker.outputs_dir)) { _out_put_dir = invoker.outputs_dir @@ -127,7 +122,7 @@ template("ohos_testsuite_base") { } } - if (_project_type != "pythontest" && _project_type != "js_test_hap") { + if (_project_type != "pythontest") { _deps = [ ":module_${target_name}" ] } else { _deps = [] @@ -227,19 +222,10 @@ template("ohos_hap_suite") { } template("ohos_js_hap_suite") { - assert(defined(invoker.hap_source_path), - "hap_source_path is required in target ${target_name}") - assert(defined(invoker.test_hap_name), - "test_hap_name is required in target ${target_name}") - - # _hap_source_path = invoker.hap_source_path - # _test_hap_name = invoker.test_hap_name - if (defined(invoker.deps)) { - _deps = invoker.deps - } target("ohos_testsuite_base", "${target_name}") { forward_variables_from(invoker, "*") - project_type = "js_test_hap" + project_type = "testhap" + js_build_mode = "debug" } } -- Gitee