diff --git a/CMakeLists.txt b/CMakeLists.txt index e9c6b6c8aaeedcc28971efec23fa37d812054df7..dacc1ad49c35316313d0b9cffafaf6b6790fb10d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,14 @@ message(STATUS "ecmascript plugin is found") add_definitions(-DENABLE_BYTECODE_OPT) add_definitions(-DARK_INTRINSIC_SET) -target_compile_definitions(arkcompiler PUBLIC -DENABLE_BYTECODE_OPT -DARK_INTRINSIC_SET) -target_compile_definitions(arkbytecodeopt PUBLIC -DENABLE_BYTECODE_OPT -DARK_INTRINSIC_SET) +panda_target_compile_definitions(arkcompiler PUBLIC -DENABLE_BYTECODE_OPT -DARK_INTRINSIC_SET) +panda_target_compile_definitions(arkbytecodeopt PUBLIC -DENABLE_BYTECODE_OPT -DARK_INTRINSIC_SET) + +add_custom_target(ecmascript_tests COMMENT "Running ecmascript test suites") + +# NB! ADDING THIS PROPERTY IS ALLOWED ONLY IN SPECIAL CASES. DO NOT COPY-PASTE IT. +set_target_properties(ecmascript_tests PROPERTIES first-level-tests-dependency TRUE) +add_dependencies(tests ecmascript_tests) if(PANDA_WITH_TOOLCHAIN) add_subdirectory(assembler) diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt index 63a9faea2c0f37339a27c798cc02fcd6708d4fa3..52d756aa2020f7f49df2a4215992670350941c2b 100644 --- a/compiler/CMakeLists.txt +++ b/compiler/CMakeLists.txt @@ -39,9 +39,9 @@ set(COMPILER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/optimizer/optimizations/inline_call_intrinsics.cpp ) -target_sources(arkcompiler PRIVATE ${COMPILER_SOURCES}) +panda_target_sources(arkcompiler PRIVATE ${COMPILER_SOURCES}) -target_include_directories(arkcompiler PUBLIC +panda_target_include_directories(arkcompiler PUBLIC ${GENERATED_DIR} ) diff --git a/compiler/ecmascript_extensions/CMakeLists.txt b/compiler/ecmascript_extensions/CMakeLists.txt index ec535e5529da1bcedf1becd6e5a1059f5fcf5e96..099b160ddb90aaa1e211e480c66918363b3402be 100644 --- a/compiler/ecmascript_extensions/CMakeLists.txt +++ b/compiler/ecmascript_extensions/CMakeLists.txt @@ -13,4 +13,4 @@ set(COMPILER_SOURCES ${PANDA_ECMASCRIPT_PLUGIN_SOURCE}/compiler/ecmascript_extensions/ecmascript_codegen_extensions.cpp) -target_sources(arkcompiler PRIVATE ${COMPILER_SOURCES}) +panda_target_sources(arkcompiler PRIVATE ${COMPILER_SOURCES}) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 418ce3ba5577ccadefaa3f8423d3c4e1b791c550..d83469648941094e64a7958af28eb7bf5a030b2d 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -217,22 +217,15 @@ add_dependencies(arkruntime_static ${irtoc_ecmascript_fastpath_target} ) -target_sources(arkruntime_static PRIVATE ${ECMASCRIPT_SOURCES} ${IRTOC_ECMASCRIPT_FASTPATH_OBJ}) -target_include_directories(arkruntime_static PUBLIC +panda_target_sources(arkruntime_static PRIVATE ${ECMASCRIPT_SOURCES} ${IRTOC_ECMASCRIPT_FASTPATH_OBJ}) +panda_target_include_directories(arkruntime_static PUBLIC ${PANDA_ECMASCRIPT_PLUGIN_SOURCE}/runtime ${PANDA_BINARY_ROOT}/compiler/generated ${PANDA_BINARY_ROOT}/plugins/ecmascript/ecmastdlib ${ECMA_GEN_DIR} ) -# Suppress warning for line `target_link_libraries(arkruntime_static es2panda-lib arkassembler)`: -# Attempt to add link library "es2panda-lib" to target "arkruntime_static" which is not built in this directory. - -if(POLICY CMP0079) - cmake_policy(SET CMP0079 NEW) -endif() - -target_link_libraries(arkruntime_static es2panda-lib arkassembler) +panda_target_link_libraries(arkruntime_static es2panda-lib arkassembler) set(RUNTIME_TEMPLATES intrinsics_gen.cpp.erb diff --git a/tests/assembler/CMakeLists.txt b/tests/assembler/CMakeLists.txt index 912203cf28f76477c63cc4ea31164cecfa78f3b7..bc769bdd0a8560d0616c337eff72ea6eaa8ff8e9 100644 --- a/tests/assembler/CMakeLists.txt +++ b/tests/assembler/CMakeLists.txt @@ -25,5 +25,5 @@ panda_add_gtest( ) if(TARGET assembler_tests_ecma) - target_compile_options(assembler_tests_ecma PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(assembler_tests_ecma PUBLIC "-Wno-ignored-attributes") endif() diff --git a/tests/runtime/CMakeLists.txt b/tests/runtime/CMakeLists.txt index 165db910280594f93e234ec726c3ee22fc92ea22..83eb6f554420bf8107607863c4ce09f7e5e897cb 100644 --- a/tests/runtime/CMakeLists.txt +++ b/tests/runtime/CMakeLists.txt @@ -190,10 +190,10 @@ NAME arkruntime4ecmascript_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_tests) - target_include_directories(arkruntime4ecmascript_tests + panda_target_include_directories(arkruntime4ecmascript_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_tests PUBLIC "-Wno-ignored-attributes") endif() #1 panda_add_gtest( @@ -209,10 +209,10 @@ NAME arkruntime4ecmascript_taggedvalue_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_taggedvalue_tests) - target_include_directories(arkruntime4ecmascript_taggedvalue_tests + panda_target_include_directories(arkruntime4ecmascript_taggedvalue_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_taggedvalue_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_taggedvalue_tests PUBLIC "-Wno-ignored-attributes") endif() #2 panda_add_gtest( @@ -228,10 +228,10 @@ NAME arkruntime4ecmascript_builtins_basic_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_basic_tests) - target_include_directories(arkruntime4ecmascript_builtins_basic_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_basic_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_basic_tests PUBLIC "-Wno-ignored-attributes" "-DICU_PATH=\"${ICU_ROOT}/ohos_icu4j/data\"") + panda_target_compile_options(arkruntime4ecmascript_builtins_basic_tests PUBLIC "-Wno-ignored-attributes" "-DICU_PATH=\"${ICU_ROOT}/ohos_icu4j/data\"") endif() #3.1 panda_add_gtest( @@ -247,10 +247,10 @@ NAME arkruntime4ecmascript_builtins_regexp_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_regexp_tests) - target_include_directories(arkruntime4ecmascript_builtins_regexp_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_regexp_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_regexp_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_regexp_tests PUBLIC "-Wno-ignored-attributes") endif() #3.2 panda_add_gtest( @@ -266,10 +266,10 @@ NAME arkruntime4ecmascript_builtins_basic_tests-1 ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_basic_tests-1) - target_include_directories(arkruntime4ecmascript_builtins_basic_tests-1 + panda_target_include_directories(arkruntime4ecmascript_builtins_basic_tests-1 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_basic_tests-1 PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_basic_tests-1 PUBLIC "-Wno-ignored-attributes") endif() #4 panda_add_gtest( @@ -285,10 +285,10 @@ NAME arkruntime4ecmascript_builtins_object_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_object_tests) - target_include_directories(arkruntime4ecmascript_builtins_object_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_object_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_object_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_object_tests PUBLIC "-Wno-ignored-attributes") endif() #5 panda_add_gtest( @@ -304,10 +304,10 @@ NAME arkruntime4ecmascript_builtins_errors_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_errors_tests) - target_include_directories(arkruntime4ecmascript_builtins_errors_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_errors_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_errors_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_errors_tests PUBLIC "-Wno-ignored-attributes") endif() #6 panda_add_gtest( @@ -323,10 +323,10 @@ NAME arkruntime4ecmascript_builtins_date_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_date_tests) - target_include_directories(arkruntime4ecmascript_builtins_date_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_date_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_date_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_date_tests PUBLIC "-Wno-ignored-attributes") endif() #7 panda_add_gtest( @@ -342,10 +342,10 @@ NAME arkruntime4ecmascript_es_basic_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_es_basic_tests) - target_include_directories(arkruntime4ecmascript_es_basic_tests + panda_target_include_directories(arkruntime4ecmascript_es_basic_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_es_basic_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_es_basic_tests PUBLIC "-Wno-ignored-attributes") endif() #7.1 panda_add_gtest( @@ -361,10 +361,10 @@ NAME arkruntime4ecmascript_es_basic_tests-1 ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_es_basic_tests-1) - target_include_directories(arkruntime4ecmascript_es_basic_tests-1 + panda_target_include_directories(arkruntime4ecmascript_es_basic_tests-1 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_es_basic_tests-1 PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_es_basic_tests-1 PUBLIC "-Wno-ignored-attributes") endif() #7.2 panda_add_gtest( @@ -380,10 +380,10 @@ NAME arkruntime4ecmascript_es_basic_tests-2 ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_es_basic_tests-2) - target_include_directories(arkruntime4ecmascript_es_basic_tests-2 + panda_target_include_directories(arkruntime4ecmascript_es_basic_tests-2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_es_basic_tests-2 PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_es_basic_tests-2 PUBLIC "-Wno-ignored-attributes") endif() #8 panda_add_gtest( @@ -399,10 +399,10 @@ NAME arkruntime4ecmascript_es_basic_object_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_es_basic_object_tests) - target_include_directories(arkruntime4ecmascript_es_basic_object_tests + panda_target_include_directories(arkruntime4ecmascript_es_basic_object_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_es_basic_object_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_es_basic_object_tests PUBLIC "-Wno-ignored-attributes") endif() #9 panda_add_gtest( @@ -418,10 +418,10 @@ ${ECMASCRIPT_BUILTINS_MATH_TESTS_SOURCES} ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_math_tests) - target_include_directories(arkruntime4ecmascript_builtins_math_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_math_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_math_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_math_tests PUBLIC "-Wno-ignored-attributes") endif() #10 panda_add_gtest( @@ -437,10 +437,10 @@ ${ECMASCRIPT_BUILTINS_JSON_TESTS_SOURCES} ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_json_tests) - target_include_directories(arkruntime4ecmascript_builtins_json_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_json_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_json_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_json_tests PUBLIC "-Wno-ignored-attributes") endif() #11 panda_add_gtest( @@ -456,10 +456,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_string_tests) - target_include_directories(arkruntime4ecmascript_builtins_string_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_string_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_string_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_string_tests PUBLIC "-Wno-ignored-attributes") endif() #12 panda_add_gtest( @@ -475,10 +475,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_array_tests) - target_include_directories(arkruntime4ecmascript_builtins_array_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_array_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_array_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_array_tests PUBLIC "-Wno-ignored-attributes") endif() #13 panda_add_gtest( @@ -494,10 +494,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_reflect_tests) - target_include_directories(arkruntime4ecmascript_builtins_reflect_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_reflect_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_reflect_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_reflect_tests PUBLIC "-Wno-ignored-attributes") endif() #14 panda_add_gtest( @@ -513,10 +513,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_arraybuffer_tests) - target_include_directories(arkruntime4ecmascript_builtins_arraybuffer_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_arraybuffer_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_arraybuffer_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_arraybuffer_tests PUBLIC "-Wno-ignored-attributes") endif() #15 panda_add_gtest( @@ -532,10 +532,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_regexp_tests) - target_include_directories(arkruntime4ecmascript_regexp_tests + panda_target_include_directories(arkruntime4ecmascript_regexp_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_regexp_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_regexp_tests PUBLIC "-Wno-ignored-attributes") endif() #16 panda_add_gtest( @@ -551,10 +551,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_dataview_tests) - target_include_directories(arkruntime4ecmascript_builtins_dataview_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_dataview_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_dataview_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_dataview_tests PUBLIC "-Wno-ignored-attributes") endif() #17 panda_add_gtest( @@ -570,10 +570,10 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_typedarray_tests) - target_include_directories(arkruntime4ecmascript_builtins_typedarray_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_typedarray_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_typedarray_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_typedarray_tests PUBLIC "-Wno-ignored-attributes") endif() #18 panda_add_gtest( @@ -614,10 +614,10 @@ ${ECMASCRIPT_BUILTINS_PROMISE_TESTS_SOURCES} ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_promise_tests) - target_include_directories(arkruntime4ecmascript_builtins_promise_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_promise_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_promise_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_promise_tests PUBLIC "-Wno-ignored-attributes") endif() #21 panda_add_gtest( @@ -633,10 +633,10 @@ NAME arkruntime4ecmascript_tests2 ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_tests2) - target_include_directories(arkruntime4ecmascript_tests2 + panda_target_include_directories(arkruntime4ecmascript_tests2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_tests2 PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_tests2 PUBLIC "-Wno-ignored-attributes") endif() #22 panda_add_gtest( @@ -652,8 +652,8 @@ NAME arkruntime4ecmascript_builtins_global_tests ${PANDA_SANITIZERS_LIST} ) if(TARGET arkruntime4ecmascript_builtins_global_tests) - target_include_directories(arkruntime4ecmascript_builtins_global_tests + panda_target_include_directories(arkruntime4ecmascript_builtins_global_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(arkruntime4ecmascript_builtins_global_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(arkruntime4ecmascript_builtins_global_tests PUBLIC "-Wno-ignored-attributes") endif() \ No newline at end of file diff --git a/tests/runtime/common/CMakeLists.txt b/tests/runtime/common/CMakeLists.txt index fd56f93940708c694a4509f111d7f4c6d5600ead..8e21f02eb0651c0caafdd247fa5b8687c7ee8b44 100644 --- a/tests/runtime/common/CMakeLists.txt +++ b/tests/runtime/common/CMakeLists.txt @@ -13,7 +13,7 @@ add_custom_target(ecmascript_common_tests) -add_dependencies(tests ecmascript_common_tests) +add_dependencies(ecmascript_tests ecmascript_common_tests) add_subdirectory(gc) add_subdirectory(helloworld) diff --git a/tests/runtime/common/missingargs/CMakeLists.txt b/tests/runtime/common/missingargs/CMakeLists.txt index 30e63d90e4f7f5b43530e2edb3a26a889631f4db..d09a98648c719c1fba840ed8e1a5dc0318ba0e07 100644 --- a/tests/runtime/common/missingargs/CMakeLists.txt +++ b/tests/runtime/common/missingargs/CMakeLists.txt @@ -20,5 +20,5 @@ add_custom_target(missingargs ) add_dependencies(missingargs es2panda ark) if(PANDA_TARGET_64) - add_dependencies(tests missingargs) + add_dependencies(ecmascript_tests missingargs) endif() diff --git a/tests/runtime/irtoc/CMakeLists.txt b/tests/runtime/irtoc/CMakeLists.txt index 7bd7dab1976d94d4ac3b7540fa00b489de4f97bf..107b83e4c45269aa830ff5605da61f2d454b56db 100644 --- a/tests/runtime/irtoc/CMakeLists.txt +++ b/tests/runtime/irtoc/CMakeLists.txt @@ -22,7 +22,7 @@ function(ecmascript_irtoc_interpreter_tests) ) add_custom_target(${ARG_TARGET} DEPENDS ${TEST_OUTPUT}) add_dependencies(${ARG_TARGET} es2panda ark) - add_dependencies(tests ${ARG_TARGET}) + add_dependencies(ecmascript_tests ${ARG_TARGET}) endfunction() add_subdirectory(basic) diff --git a/tests/runtime/napi/CMakeLists.txt b/tests/runtime/napi/CMakeLists.txt index 51ce49c050e2d6dc9f60368be965537534ac44b8..b121ba72c4f009cf1f9fe470519dd238ab94c63d 100644 --- a/tests/runtime/napi/CMakeLists.txt +++ b/tests/runtime/napi/CMakeLists.txt @@ -21,8 +21,8 @@ panda_add_gtest( ${PANDA_SANITIZERS_LIST} ) if(TARGET jsnapi_tests) - target_include_directories(jsnapi_tests + panda_target_include_directories(jsnapi_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - target_compile_options(jsnapi_tests PUBLIC "-Wno-ignored-attributes") + panda_target_compile_options(jsnapi_tests PUBLIC "-Wno-ignored-attributes") endif() diff --git a/tests/runtime/tooling/CMakeLists.txt b/tests/runtime/tooling/CMakeLists.txt index 5133ffa7a2bafc0f9a60202d8d556e73c8b1140e..bf5964b2250a2eece7ab7766c6f7779ab686c0bb 100644 --- a/tests/runtime/tooling/CMakeLists.txt +++ b/tests/runtime/tooling/CMakeLists.txt @@ -27,7 +27,7 @@ panda_add_gtest( add_dependencies(debug_api_tests_ecma arkstdlib) -target_compile_definitions(debug_api_tests_ecma +panda_target_compile_definitions(debug_api_tests_ecma PUBLIC DEBUG_LIBRARY_PATH="$" PANDA_STD_LIB="${PANDA_BINARY_ROOT}/pandastdlib/arkstdlib.abc")