diff --git a/.gitignore b/.gitignore index 64cf979d0e82b87b1189831322843a8fff529fb9..ed8aaeb147762d6d52e3c90e68c67a5d2e36ed88 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ tsconfig.tsbuildinfo incremental/benchmarks/memo-benchmark/ets koala_mirror ets1.2 +*results.log diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 4d1977aa07c13627801b3cc0b671de43f7ba406a..2a8f640274e87a357152c4dee2b87123d65b103e 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -133,6 +133,7 @@ build arkui.abc: - annotate all - download and prepare SDK - build interop + - generate arkts script: - npm run build --prefix arkoala-arkts/arkui - ls -l arkoala-arkts/arkui/build/arkui.abc @@ -192,6 +193,7 @@ build trivial.abc: - build ui2abc-all M3 - annotate all - download and prepare SDK + - generate arkts script: - npm run build --prefix arkoala-arkts/trivial/user - ls -l arkoala-arkts/trivial/user/build/user.abc @@ -209,6 +211,7 @@ build shopping.abc: - build ui2abc-all M3 - annotate all - download and prepare SDK + - generate arkts script: - npm run build --prefix arkoala-arkts/shopping/user - ls -l arkoala-arkts/shopping/user/build/user.abc @@ -226,6 +229,7 @@ build cats.abc: - build ui2abc-all M3 - annotate all - download and prepare SDK + - generate arkts script: - npm run build --prefix arkoala-arkts/cats/user - ls -l arkoala-arkts/cats/user/build/user.abc diff --git a/incremental/harness/src/arkts/shared.ts b/incremental/harness/src/arkts/shared.ts index 75b5a181738f49ed230c572d4f8f3c81f8ff281e..f53606b9f66a6bea6441bd41eb647d9f67a37e45 100644 --- a/incremental/harness/src/arkts/shared.ts +++ b/incremental/harness/src/arkts/shared.ts @@ -102,6 +102,9 @@ function logResults(array: ReadonlyArray) { logResult(map, FAILED_AS_EXPECTED_PREFIX) logResult(map, PASSED_UNEXPECTEDLY_PREFIX) logResult(map, FAILED_PREFIX) + // TBD: remove this log when the plain_text type result output is added + const result = (map.get(FAILED_PREFIX) ?? 0) > 0 ? "FAILED" : "PASSED" + console.log(`Test suite: ${result}`) } function logResult(map: Map, key: string) { diff --git a/libarkts/.gitlab-ci.yml b/libarkts/.gitlab-ci.yml index 4921eaf64e8fcd7c80ff6a6c9600f129fb9424e5..11f2429b66a09ad8bf0477de6adbc9a453740f45 100644 --- a/libarkts/.gitlab-ci.yml +++ b/libarkts/.gitlab-ci.yml @@ -109,7 +109,7 @@ build ninja (libarkts_sdk_copy): LIBARKTS_OUTPUT_DIR: $GN_DIR/gen/libarkts artifacts: paths: - - $LIBARKTS_OUTPUT_DIR/build/native/build/es2panda.node + - $LIBARKTS_OUTPUT_DIR/build/native/es2panda.node - $LIBARKTS_OUTPUT_DIR/lib/es2panda.js - $LIBARKTS_OUTPUT_DIR/lib/libarkts.js expire_in: 1 day \ No newline at end of file diff --git a/libarkts/BUILD.gn b/libarkts/BUILD.gn index 4fb28eadf9156b1d22c306a7e96effa267c98691..045662f68deb0e6f39be2c98bfb291cded191f9c 100644 --- a/libarkts/BUILD.gn +++ b/libarkts/BUILD.gn @@ -102,7 +102,7 @@ shared_library("es2panda_lib") { if (!koala_mr.is_rri) { external_deps = [ "ets_frontend:ets2panda" ] } - output_dir = rebase_path(root_out_dir + "/libarkts") + # output_dir = rebase_path(root_out_dir + "/libarkts") sources = [ "${koala_mr.libarkts_path}/native/src/common.cc", @@ -271,11 +271,15 @@ action("es2panda_lib_copy") { # inputs = [ # "$from_path/libes2panda_lib.node" # ] + inputs = [ + "$from_path/libes2panda_lib.node" + ] outputs = [ "$target_out_dir/es2panda.node" ] args = [ - "--from-path", rebase_path(from_path + "/libarkts"), + "--from-path", rebase_path(from_path), + # "--from-path", rebase_path(from_path + "/libarkts"), "--to-path", rebase_path("."), "--current-os", current_os, "--current-cpu", current_cpu diff --git a/libarkts/package.json b/libarkts/package.json index 8641678f121e8c096710bbbb17b5a6f692896992..0deb9874a321cc083d2ff39f6abd44df2bd2d1b5 100644 --- a/libarkts/package.json +++ b/libarkts/package.json @@ -24,7 +24,7 @@ ], "config": { "panda_sdk_path": "../incremental/tools/panda/node_modules/@panda/sdk", - "panda_sdk_version": "next" + "panda_sdk_version": "1.5.0-dev.50536" }, "dependencies": { "@koalaui/compat": "1.7.10+devel", diff --git a/ui2abc/ets-tests/.gitlab-ci.yml b/ui2abc/ets-tests/.gitlab-ci.yml index 7f17b361fa2823c21cc9f0adb254bca7a750d1e5..15f156515570aa8342285906f1bf7313aeb8b0f5 100644 --- a/ui2abc/ets-tests/.gitlab-ci.yml +++ b/ui2abc/ets-tests/.gitlab-ci.yml @@ -33,6 +33,54 @@ build ets-tests.abc (golden): - ui2abc/ets-tests/build/ets-tests.abc expire_in: 1 day +Headless tests: + stage: test + interruptible: true + extends: .linux-vm-shell-task + before_script: + - !reference [.setup, script] + script: + - npm i + - cd tools + - npm run sdk1.2:download + - npm run clt1.2:download + - cd .. + - npm i --prefix ui2abc + - npm run build:all -C ui2abc + # - git restore arkoala-arkts/framework/native/src/generated/ + - npm run all:ace_golden -C ui2abc/ets-tests + variables: + USE_KOALA_LIBARKTS: 1 + USE_KOALA_MEMO_PLUGIN: 1 + USE_KOALA_UI_PLUGIN: 1 + ETS_TEST_GOLDEN_PATH: $CI_PROJECT_DIR/ui2abc/ets-tests/ets/golden-tests/golden/ + ETS_TEST_OUT_PATH: $CI_PROJECT_DIR/ui2abc/ets-tests/build/golden/ + needs: + - download and prepare SDK + - install node modules (root) + - install panda sdk + - build arkoala.abc + - build harness.abc + - build ets-tests.abc (golden) + - build ArkoalaNative (linux, linux, node+panda) + - generate arkts + artifacts: + paths: + - ui2abc/ets-tests/build/golden + - ui2abc/ets-tests/testsuite_ace_golden_results.log + expire_in: 1 day + +Check Headless tests: + stage: test + interruptible: true + extends: .linux-vm-shell-task + before_script: + - !reference [.setup, script] + script: + - npm run check:ace_golden -C ui2abc/ets-tests + needs: + - Headless tests + run ets-tests M3 (linux, node): stage: test interruptible: true diff --git a/ui2abc/ets-tests/package.json b/ui2abc/ets-tests/package.json index 0002339abd41ae6bb6fc6d54383f8d4c8b642a5f..7ff413a1baa2bd4318c7d828df30eee5c198b839 100644 --- a/ui2abc/ets-tests/package.json +++ b/ui2abc/ets-tests/package.json @@ -35,7 +35,8 @@ "pack:tests": "cp ./build/ets-tests.abc ../../tools/ohos-tools/golden-prebuild/golden-binary/previewer/common/bin/module/arkts_framework", "pack:all":"npm run pack:arkoala && npm run pack:harness && npm run pack:tests && rm -f ../../tools/ohos-tools/golden-prebuild/golden-binary/previewer/common/bin/module/arkts_framework/rpc_taihe_abc.abc", "run:ace_golden": "npm run build:golden && npm run pack:all && npm run run:ace_launch", - "run:ace_launch": "bash ./tools/launch.sh", + "run:ace_launch": "bash ./tools/launch.sh | tee testsuite_ace_golden_results.log || true", + "check:ace_golden": "cat testsuite_ace_golden_results.log | grep -B 16 'Test suite' && cat testsuite_ace_golden_results.log | grep 'Test suite: PASSED'", "pack:get_from_ohos": "bash ./tools/get_from_ohos.sh", "prepare:arkui": "npm run prepare:sdk --prefix ../../arkoala-arkts/arkui",