diff --git a/ets2panda/scripts/arkui-setup.sh b/ets2panda/scripts/arkui-setup.sh index fbb054131fd8ab3f8dc75b4f42118d588c4e9f9e..cf3174d14a26ac7d0d0f50eb2536eac20cc1b907 100755 --- a/ets2panda/scripts/arkui-setup.sh +++ b/ets2panda/scripts/arkui-setup.sh @@ -159,6 +159,14 @@ function run_script() { fi } +function skip_linker_verification_error() { + npm run $1 | tee out.txt + ERROR_MESSAGE="$(grep 'Error:' out.txt)" + if [ -n $ERROR_MESSAGE && $ERROR_MESSAGE == *"LinkerVerificationError:"* ] ; then + exit 1 + fi +} + export ENABLE_BUILD_CACHE=0 # Compile libarkts @@ -188,6 +196,12 @@ case "${DEMO}" in "trivial") run_script "run --prefix arkoala-arkts/trivial/user" ;; + "ets-tests") + skip_linker_verification_error "run --prefix ets-tests" + ;; + "ui2abc-tests") + run_script "test:all --prefix ui2abc" + ;; "empty") ;; *) diff --git a/ets2panda/scripts/arkui.properties b/ets2panda/scripts/arkui.properties index 81cb4b5794e071332e7d2f3a802d9f136e3031ec..d3df6ce0fea2acef58a81424d531ad11fc313258 100644 --- a/ets2panda/scripts/arkui.properties +++ b/ets2panda/scripts/arkui.properties @@ -1,3 +1,3 @@ -ARKUI_DEV_REPO=https://gitee.com/rri_opensource/koala_projects.git -ARKUI_DEV_BRANCH=panda_rev_10-fix-objectliteral +ARKUI_DEV_REPO=https://gitee.com/titovatatiana/koala_projects.git +ARKUI_DEV_BRANCH=check-aot ARKUI_DEST=koala-sig