From 995fd43f19faacd5388369c8d692a3439ec4f475 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Tue, 30 May 2023 23:45:21 +0800 Subject: [PATCH 01/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index a5e7bc4f913..57d848f8f42 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -32,21 +32,7 @@ jobs: fail-fast: false matrix: legs: - - {UTEST: "kernel/mem", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/ipc", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/ipc.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/irq", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/irq.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/timer", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/timer.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/thread", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/thread.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/atomic", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/atomic.conf", SD_FILE: "sd.bin", RUN: "yes"} - {UTEST: "kernel/atomic_c11", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/atomic_c11.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "components/utest", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "utest_self/self.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "components/cpp11", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "cpp11/cpp11.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/mem/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "None", RUN: "yes"} - - {UTEST: "kernel/atomic/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/atomic.conf", SD_FILE: "None", RUN: "yes"} - - {UTEST: "kernel/atomic_c11/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/atomic_c11.conf", SD_FILE: "None", RUN: "yes"} - - {UTEST: "rtsmart/arm", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "rtsmart/base.conf", SD_FILE: "sd.bin", RUN: "no"} - - {UTEST: "rtsmart/aarch64", RTT_BSP: "bsp/qemu-virt64-aarch64", QEMU_ARCH: "aarch64", QEMU_MACHINE: "virt", CONFIG_FILE: "rtsmart/base.conf", SD_FILE: "sd.bin", RUN: "no"} - - {UTEST: "rtsmart/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "rtsmart/base.conf", SD_FILE: "None", RUN: "yes"} env: TEST_QEMU_ARCH: ${{ matrix.legs.QEMU_ARCH }} TEST_QEMU_MACHINE: ${{ matrix.legs.QEMU_MACHINE }} @@ -130,7 +116,18 @@ jobs: cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT scons -j$(nproc) --strict -C $TEST_BSP_ROOT + mkdir ${{ github.workspace }}/exe + cp -r bsp/${{ github.event.inputs.bsp_options }} ${{ github.workspace }}/exe/ + scons --dist -C bsp/${{ github.event.inputs.bsp_options }} + cp bsp/${{ github.event.inputs.bsp_options }}/dist/project.zip ${{ github.workspace }}/exe/ + ls bsp/${{ github.event.inputs.bsp_options }}/dist + pwd + - uses: actions/upload-artifact@v3 + with: + name: exe + path: ${{ github.workspace }}/exe/* + - name: Start run Test if: ${{matrix.legs.RUN == 'yes' && success() }} run: | From 4f2d23576c3fe1cbd24aea5c402105bfd7467edc Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Tue, 30 May 2023 23:47:45 +0800 Subject: [PATCH 02/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 57d848f8f42..80da4448ff2 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -122,7 +122,12 @@ jobs: cp bsp/${{ github.event.inputs.bsp_options }}/dist/project.zip ${{ github.workspace }}/exe/ ls bsp/${{ github.event.inputs.bsp_options }}/dist pwd - + cd bsp/qemu-vexpress-a9 + ls + sudo nohup ./qemu-nographic.sh > cmd3.out 2>&1 & + sleep 100 + cat cmd3.out + - uses: actions/upload-artifact@v3 with: name: exe From 8a266a88b1e792b785f6eb9b930f4ca9b0eab5bd Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Tue, 30 May 2023 23:55:02 +0800 Subject: [PATCH 03/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 80da4448ff2..6f87d8b44d7 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -117,10 +117,10 @@ jobs: scons --pyconfig-silent -C $TEST_BSP_ROOT scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe - cp -r bsp/${{ github.event.inputs.bsp_options }} ${{ github.workspace }}/exe/ - scons --dist -C bsp/${{ github.event.inputs.bsp_options }} - cp bsp/${{ github.event.inputs.bsp_options }}/dist/project.zip ${{ github.workspace }}/exe/ - ls bsp/${{ github.event.inputs.bsp_options }}/dist + cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ + scons --dist -C $TEST_BSP_ROOT + cp $TEST_BSP_ROOT/dist/project.zip ${{ github.workspace }}/exe/ + ls $TEST_BSP_ROOT/dist pwd cd bsp/qemu-vexpress-a9 ls From b7b6410d926c0a065be0e7d516498821fedbac00 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 00:09:38 +0800 Subject: [PATCH 04/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 6f87d8b44d7..b37cfdb479a 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -115,6 +115,10 @@ jobs: echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT + sed -i "s/# CONFIG_PKG_USING_RTT_AUTO_EXE_CMD is not set/CONFIG_PKG_USING_RTT_AUTO_EXE_CMD=y/g" bsp/$RTT_BSP/.config + scons --pyconfig-silent -C bsp/$RTT_BSP + sed -i "s/CONFIG_RTT_CMD_1_STR=\"version\"/CONFIG_RTT_CMD_1_STR=\"utest_run\"/g" bsp/$RTT_BSP/.config + scons --pyconfig-silent -C bsp/$RTT_BSP scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ From b997753dfb4c22bceb462e7959d139be88885bca Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 00:19:25 +0800 Subject: [PATCH 05/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index b37cfdb479a..4ef87e6f860 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -115,10 +115,10 @@ jobs: echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT - sed -i "s/# CONFIG_PKG_USING_RTT_AUTO_EXE_CMD is not set/CONFIG_PKG_USING_RTT_AUTO_EXE_CMD=y/g" bsp/$RTT_BSP/.config - scons --pyconfig-silent -C bsp/$RTT_BSP - sed -i "s/CONFIG_RTT_CMD_1_STR=\"version\"/CONFIG_RTT_CMD_1_STR=\"utest_run\"/g" bsp/$RTT_BSP/.config - scons --pyconfig-silent -C bsp/$RTT_BSP + sed -i "s/# CONFIG_PKG_USING_RTT_AUTO_EXE_CMD is not set/CONFIG_PKG_USING_RTT_AUTO_EXE_CMD=y/g" $TEST_BSP_ROOT/.config + scons --pyconfig-silent -C $TEST_BSP_ROOT + sed -i "s/CONFIG_RTT_CMD_1_STR=\"version\"/CONFIG_RTT_CMD_1_STR=\"utest_run\"/g" $TEST_BSP_ROOT/.config + scons --pyconfig-silent -C $TEST_BSP_ROOT scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ From 992669a80c28f133d575ba56b1b00b05a96f410b Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 00:32:27 +0800 Subject: [PATCH 06/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 4ef87e6f860..83c4e680d9d 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -119,6 +119,8 @@ jobs: scons --pyconfig-silent -C $TEST_BSP_ROOT sed -i "s/CONFIG_RTT_CMD_1_STR=\"version\"/CONFIG_RTT_CMD_1_STR=\"utest_run\"/g" $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT + pushd $TEST_BSP_ROOT && pkgs --update && popd + scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ From 8269d948c2eec32dcc57633402d4f122b1082e96 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 00:38:45 +0800 Subject: [PATCH 07/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 83c4e680d9d..fbd7438724f 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -123,7 +123,6 @@ jobs: scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe - cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ scons --dist -C $TEST_BSP_ROOT cp $TEST_BSP_ROOT/dist/project.zip ${{ github.workspace }}/exe/ ls $TEST_BSP_ROOT/dist From a21d271d18a9649aa5535535e9dddced4c29bdd8 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 00:43:36 +0800 Subject: [PATCH 08/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index fbd7438724f..37646affa6d 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -120,12 +120,9 @@ jobs: sed -i "s/CONFIG_RTT_CMD_1_STR=\"version\"/CONFIG_RTT_CMD_1_STR=\"utest_run\"/g" $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT pushd $TEST_BSP_ROOT && pkgs --update && popd - scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe scons --dist -C $TEST_BSP_ROOT - cp $TEST_BSP_ROOT/dist/project.zip ${{ github.workspace }}/exe/ - ls $TEST_BSP_ROOT/dist pwd cd bsp/qemu-vexpress-a9 ls From 856568300f15d117beeeb722869fd93888dd0211 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 07:51:45 +0800 Subject: [PATCH 09/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 37646affa6d..9906696c4cd 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -47,7 +47,15 @@ jobs: run: | sudo apt-get update sudo apt-get -yqq install scons qemu-system git - + sudo apt-get -qq install gcc-multilib libncurses5 libncurses5-dev libncursesw5-dev scons + sudo python -m pip install --upgrade pip -qq + pip install requests -qq + git config --global http.postBuffer 524288000 + python -c "import tools.menuconfig; tools.menuconfig.touch_env()" + echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV + echo "RTT_CC=gcc" >> $GITHUB_ENV + source ~/.env/env.sh + - name: Install Arm ToolChains if: ${{ matrix.legs.QEMU_ARCH == 'arm' && matrix.legs.UTEST != 'rtsmart/arm' && success() }} shell: bash From 34c3646157b774f71668e2c2f77f2309c813a6a1 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 08:01:07 +0800 Subject: [PATCH 10/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 9906696c4cd..d7930128af8 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -54,7 +54,7 @@ jobs: python -c "import tools.menuconfig; tools.menuconfig.touch_env()" echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV echo "RTT_CC=gcc" >> $GITHUB_ENV - source ~/.env/env.sh + - name: Install Arm ToolChains if: ${{ matrix.legs.QEMU_ARCH == 'arm' && matrix.legs.UTEST != 'rtsmart/arm' && success() }} @@ -120,6 +120,7 @@ jobs: - name: Build BSP run: | + source ~/.env/env.sh echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT From c31d1e4bdb1038cb1e4eb4ddbd35c88fd6b6f0c8 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 08:03:11 +0800 Subject: [PATCH 11/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index d7930128af8..1aaa732cb3f 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -118,6 +118,10 @@ jobs: # Clear -fno-exceptions in rtconfig.py sed -i 's/-fno-exceptions/ /g' $TEST_BSP_ROOT/rtconfig.py + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: 3.8 - name: Build BSP run: | source ~/.env/env.sh From 6eeb8956ca9a1fac89f8743381169312ed4990da Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 08:17:09 +0800 Subject: [PATCH 12/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index 1aaa732cb3f..ce20e42597f 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -41,7 +41,11 @@ jobs: TEST_SD_FILE: ${{ matrix.legs.SD_FILE }} steps: - uses: actions/checkout@v3 - + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: 3.8 + - name: Install Tools shell: bash run: | @@ -118,10 +122,7 @@ jobs: # Clear -fno-exceptions in rtconfig.py sed -i 's/-fno-exceptions/ /g' $TEST_BSP_ROOT/rtconfig.py - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: 3.8 + - name: Build BSP run: | source ~/.env/env.sh From fcb0efe049735effc06ab619f2820a681c66efea Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 08:54:06 +0800 Subject: [PATCH 13/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index ce20e42597f..eaf013d7f6e 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -136,7 +136,11 @@ jobs: pushd $TEST_BSP_ROOT && pkgs --update && popd scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe + cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ + scons --dist -C bsp/${{ github.event.inputs.bsp_options }} + cp $TEST_BSP_ROOT/dist/project.zip ${{ github.workspace }}/exe/ scons --dist -C $TEST_BSP_ROOT + pwd cd bsp/qemu-vexpress-a9 ls From 29caf6ee9bb99fd40ce77d78a9fcec3f18b38f4a Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Wed, 31 May 2023 09:00:55 +0800 Subject: [PATCH 14/14] Update action_utest.yml --- .github/workflows/action_utest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index eaf013d7f6e..a123a114f44 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -137,7 +137,7 @@ jobs: scons -j$(nproc) --strict -C $TEST_BSP_ROOT mkdir ${{ github.workspace }}/exe cp -r $TEST_BSP_ROOT ${{ github.workspace }}/exe/ - scons --dist -C bsp/${{ github.event.inputs.bsp_options }} + scons --dist -C $TEST_BSP_ROOT cp $TEST_BSP_ROOT/dist/project.zip ${{ github.workspace }}/exe/ scons --dist -C $TEST_BSP_ROOT