From d6a6ee67bea37956e075f90b69f22a2903d328a6 Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Fri, 2 Feb 2024 14:49:17 +0300 Subject: [PATCH 1/8] Use python3 explicitly in es2panda_coverage.sh Signed-off-by: Svetlana Rokashevich --- ets2panda/scripts/es2panda_coverage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index f6a2ed89d1..0777043147 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -28,7 +28,7 @@ case "$ARGUMENT" in esac done -python $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ +python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* -- Gitee From e86fad475c7dfed85c031978b7025bdb41cef42e Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Sun, 11 Feb 2024 21:52:40 +0300 Subject: [PATCH 2/8] Activate env and exclude dir Signed-off-by: Svetlana Rokashevich --- ets2panda/cmake/coverage.cmake | 1 + ets2panda/scripts/es2panda_coverage.sh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ets2panda/cmake/coverage.cmake b/ets2panda/cmake/coverage.cmake index 794bf7a6e7..b5f6602081 100644 --- a/ets2panda/cmake/coverage.cmake +++ b/ets2panda/cmake/coverage.cmake @@ -30,6 +30,7 @@ if(ENABLE_ES2PANDA_COVERAGE) collect_coverage_for_target( TARGET_NAME es2panda_coverage INCLUDE_DIR_PATTERN '*/es2panda/*' + EXCLUDE_DIR_PATTERN '*/es2panda/public/*' ) else() message(STATUS "Coverage will not be calculated (may be enabled by -DENABLE_ES2PANDA_COVERAGE=true ).") diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index 0777043147..9de30b76a3 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -28,9 +28,14 @@ case "$ARGUMENT" in esac done +source $PANDA_ROOT/scripts/python/venv-utils.sh +activate_venv + python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all +deactivate_venv + gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* if [ -x "$(command -v gcovr)" ]; then -- Gitee From 4858753dad07e7198b96ed8a6a11b74cf068499c Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Wed, 14 Feb 2024 16:38:43 +0300 Subject: [PATCH 3/8] Don't set env Signed-off-by: Svetlana Rokashevich --- ets2panda/scripts/es2panda_coverage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index 9de30b76a3..82d2e3210b 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -28,13 +28,13 @@ case "$ARGUMENT" in esac done -source $PANDA_ROOT/scripts/python/venv-utils.sh -activate_venv +# source $PANDA_ROOT/scripts/python/venv-utils.sh +# activate_venv python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all -deactivate_venv +# deactivate_venv gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* -- Gitee From d452d76c49d7c9af53c4b70defc2008c07462dbf Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Wed, 14 Feb 2024 23:19:27 +0300 Subject: [PATCH 4/8] try to set +e Signed-off-by: Svetlana Rokashevich --- ets2panda/scripts/es2panda_coverage.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index 82d2e3210b..f7f4eeb211 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -28,13 +28,15 @@ case "$ARGUMENT" in esac done -# source $PANDA_ROOT/scripts/python/venv-utils.sh -# activate_venv +source $PANDA_ROOT/scripts/python/venv-utils.sh +activate_venv +set +e python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all -# deactivate_venv +set -e +deactivate_venv gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* -- Gitee From 5f0553d18d533bce7eb39c8ec034b6311383be34 Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Thu, 15 Feb 2024 12:47:19 +0300 Subject: [PATCH 5/8] Debug Signed-off-by: Svetlana Rokashevich --- ets2panda/scripts/es2panda_coverage.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index f7f4eeb211..f22ca1f82b 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -16,6 +16,8 @@ set -e +export PATH=~/.venv-panda/bin:$PATH + for ARGUMENT in "$@" do case "$ARGUMENT" in @@ -28,15 +30,17 @@ case "$ARGUMENT" in esac done -source $PANDA_ROOT/scripts/python/venv-utils.sh -activate_venv -set +e +# echo "before activate" +# source $PANDA_ROOT/scripts/python/venv-utils.sh +# activate_venv +# set +e +# echo "after activate" -python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ - --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all +bash -c "python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ + --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all" -set -e -deactivate_venv +# set -e +# deactivate_venv gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* -- Gitee From 40267d72f0845406c22a292a4d35193b4582553e Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Fri, 16 Feb 2024 07:21:10 +0300 Subject: [PATCH 6/8] Try to remove show progress Signed-off-by: Svetlana Rokashevich --- ets2panda/scripts/es2panda_coverage.sh | 21 +++++++++++---------- ets2panda/scripts/test_runner.py | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index f22ca1f82b..8bcc5c0099 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -16,7 +16,7 @@ set -e -export PATH=~/.venv-panda/bin:$PATH +# export PATH=~/.venv-panda/bin:$PATH for ARGUMENT in "$@" do @@ -30,17 +30,18 @@ case "$ARGUMENT" in esac done -# echo "before activate" -# source $PANDA_ROOT/scripts/python/venv-utils.sh -# activate_venv -# set +e -# echo "after activate" +echo nproc=`nproc` +echo "before activate" +source $PANDA_ROOT/scripts/python/venv-utils.sh +activate_venv +set +e +echo "after activate" -bash -c "python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ - --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all" +python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ + --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all -# set -e -# deactivate_venv +set -e +deactivate_venv gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* diff --git a/ets2panda/scripts/test_runner.py b/ets2panda/scripts/test_runner.py index 7250909885..553d6aa0c1 100644 --- a/ets2panda/scripts/test_runner.py +++ b/ets2panda/scripts/test_runner.py @@ -62,8 +62,8 @@ def main(): if not os.path.isfile(testrunner): print("The following script is not executable or exist: {0}".format(testrunner)) - general_cmd = ['python', testrunner, '--build-dir', options.builddir, '--force-generate', - '--show-progress', '--processes', 'all', '--timeout', str(options.timeout)] + general_cmd = ['python', '-B', testrunner, '--build-dir', options.builddir, '--force-generate', + '--processes', '13', '--no-js', '--timeout', str(options.timeout)] if options.all: options.regression = options.runtime = options.cts = options.functional = options.test262 = True -- Gitee From c20d95c2c7d0c698a1ea7d33562cd488be71f1c8 Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Mon, 11 Mar 2024 09:06:07 +0300 Subject: [PATCH 7/8] Remove redundant Signed-off-by: Svetlana Rokashevich --- ets2panda/cmake/coverage.cmake | 1 - ets2panda/scripts/es2panda_coverage.sh | 12 ------------ ets2panda/scripts/test_runner.py | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/ets2panda/cmake/coverage.cmake b/ets2panda/cmake/coverage.cmake index b5f6602081..794bf7a6e7 100644 --- a/ets2panda/cmake/coverage.cmake +++ b/ets2panda/cmake/coverage.cmake @@ -30,7 +30,6 @@ if(ENABLE_ES2PANDA_COVERAGE) collect_coverage_for_target( TARGET_NAME es2panda_coverage INCLUDE_DIR_PATTERN '*/es2panda/*' - EXCLUDE_DIR_PATTERN '*/es2panda/public/*' ) else() message(STATUS "Coverage will not be calculated (may be enabled by -DENABLE_ES2PANDA_COVERAGE=true ).") diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index 8bcc5c0099..0777043147 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -16,8 +16,6 @@ set -e -# export PATH=~/.venv-panda/bin:$PATH - for ARGUMENT in "$@" do case "$ARGUMENT" in @@ -30,19 +28,9 @@ case "$ARGUMENT" in esac done -echo nproc=`nproc` -echo "before activate" -source $PANDA_ROOT/scripts/python/venv-utils.sh -activate_venv -set +e -echo "after activate" - python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all -set -e -deactivate_venv - gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* if [ -x "$(command -v gcovr)" ]; then diff --git a/ets2panda/scripts/test_runner.py b/ets2panda/scripts/test_runner.py index 553d6aa0c1..8cafca9757 100644 --- a/ets2panda/scripts/test_runner.py +++ b/ets2panda/scripts/test_runner.py @@ -63,7 +63,7 @@ def main(): print("The following script is not executable or exist: {0}".format(testrunner)) general_cmd = ['python', '-B', testrunner, '--build-dir', options.builddir, '--force-generate', - '--processes', '13', '--no-js', '--timeout', str(options.timeout)] + '--show-progress', '--processes', 'all', '--timeout', str(options.timeout)] if options.all: options.regression = options.runtime = options.cts = options.functional = options.test262 = True -- Gitee From eff971de68dee2401dd65f6d623edfd3645f1cb6 Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Mon, 11 Mar 2024 10:06:36 +0300 Subject: [PATCH 8/8] Activate env Signed-off-by: Svetlana Rokashevich --- ets2panda/scripts/es2panda_coverage.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh index 0777043147..f7f4eeb211 100644 --- a/ets2panda/scripts/es2panda_coverage.sh +++ b/ets2panda/scripts/es2panda_coverage.sh @@ -28,9 +28,16 @@ case "$ARGUMENT" in esac done +source $PANDA_ROOT/scripts/python/venv-utils.sh +activate_venv +set +e + python3 $PANDA_ROOT/tools/es2panda/scripts/test_runner.py \ --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all +set -e +deactivate_venv + gcov $PANDA_BINARY_ROOT/tools/es2panda/CMakeFiles/es2panda-lib.dir/*/* if [ -x "$(command -v gcovr)" ]; then -- Gitee