From 81c617638d206980688fdd320fc6603a9d4eaf6e Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Sun, 19 Mar 2023 09:50:26 +0300 Subject: [PATCH 1/2] Add install to CMake files Signed-off-by: Svetlana Rokashevich --- runtime/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index a11ce6bce..ecbe486ca 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -193,7 +193,8 @@ if(NOT (CMAKE_CROSSCOMPILING OR PANDA_TARGET_OHOS)) INPUT_FILES ${IRTOC_ECMASCRIPT_SCRIPTS}/object.irt ${IRTOC_ECMASCRIPT_SCRIPTS}/new_obj_dyn.irt TARGET_VARIABLE IRTOC_ECMASCRIPT_FASTPATH_OBJ) - + install(TARGETS irtoc_ecmascript_fastpath_exec DESTINATION bin) + if (NOT EXISTS ${IRTOC_ECMASCRIPT_FASTPATH_OBJ}) file(TOUCH ${IRTOC_ECMASCRIPT_FASTPATH_OBJ}) endif() -- Gitee From 6a9224679f538df8caa2d99f00027574e161a807 Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Mon, 27 Mar 2023 13:39:03 +0300 Subject: [PATCH 2/2] Use prebuilt binaries for missingargs test Signed-off-by: Svetlana Rokashevich --- .../runtime/common/missingargs/CMakeLists.txt | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/runtime/common/missingargs/CMakeLists.txt b/tests/runtime/common/missingargs/CMakeLists.txt index 30e63d90e..8017ab0eb 100644 --- a/tests/runtime/common/missingargs/CMakeLists.txt +++ b/tests/runtime/common/missingargs/CMakeLists.txt @@ -7,18 +7,30 @@ set(MISSINGARGS_VERIFY ${CMAKE_CURRENT_SOURCE_DIR}/verify.sh) set(RUNTIME_ARGUMENTS --boot-panda-files=${PANDA_BINARY_ROOT}/pandastdlib/arkstdlib.abc --load-runtimes=\"ecmascript\" --compiler-enable-jit=false --gc-type=epsilon ${MISSINGARGS_BIN} _GLOBAL::func_main_0) +add_custom_target(missingargs + DEPENDS ${MISSINGARGS_OUTPUT} ${MISSINGARGS_VERIFY} +) + +if(NOT DEFINED ENV{ARTIFACTS_INSTALLED}) + message("run tests locally") + add_dependencies(missingargs es2panda ark) + set(ES2PANDA_BIN $) + set(ARK_BIN $) +else() + message("run tests with prebuilt binaries") + set(ES2PANDA_BIN ${CMAKE_BINARY_DIR}/bin/es2panda) + set(ARK_BIN ${CMAKE_BINARY_DIR}/bin/ark) +endif() + add_custom_command( OUTPUT ${MISSINGARGS_OUTPUT} COMMENT "running javascript missingargs testcase" - COMMAND ${PANDA_RUN_PREFIX} $ ${MISSINGARGS_JS} --output ${MISSINGARGS_BIN} + COMMAND ${PANDA_RUN_PREFIX} ${ES2PANDA_BIN} ${MISSINGARGS_JS} --output ${MISSINGARGS_BIN} COMMAND rm -f ${MISSINGARGS_OUTPUT} - COMMAND ${PANDA_RUN_PREFIX} $ ${RUNTIME_ARGUMENTS} 2>&1 > ${MISSINGARGS_OUTPUT} + COMMAND ${PANDA_RUN_PREFIX} ${ARK_BIN} ${RUNTIME_ARGUMENTS} 2>&1 > ${MISSINGARGS_OUTPUT} COMMAND bash ${MISSINGARGS_VERIFY} ${MISSINGARGS_OUTPUT} ) -add_custom_target(missingargs - DEPENDS ${MISSINGARGS_OUTPUT} ${MISSINGARGS_VERIFY} -) -add_dependencies(missingargs es2panda ark) + if(PANDA_TARGET_64) add_dependencies(tests missingargs) endif() -- Gitee