sync script

Author: kurisaW

.github/workflows/action_auto_utest.yml

@@ -142,49 +142,39 @@ jobs:
           scons -j$(nproc) --strict -C $TEST_BSP_ROOT
 
       - name: QEMU Run Test
+        shell: bash
         if: ${{ matrix.platform.RUN == 'yes' && env.TOOLCHAIN_INSTALLED != '' && success() }}
         run: |
-          # if [ "$TEST_SD_FILE" != "None" ]; then
-          #   dd if=/dev/zero of=$TEST_BSP_ROOT/sd.bin bs=1024 count=65536
-          #   mkfs.fat $TEST_BSP_ROOT/sd.bin
-          #   qemu-system-$TEST_QEMU_ARCH -nographic -M $TEST_QEMU_MACHINE -kernel $TEST_BSP_ROOT/rtthread.bin -nographic -sd $TEST_BSP_ROOT/sd.bin > qemu_output_$TEST_QEMU_ARCH.log 2>&1 &
-          # else
-          #   qemu-system-$TEST_QEMU_ARCH -nographic -M $TEST_QEMU_MACHINE -kernel $TEST_BSP_ROOT/rtthread.bin -nographic > qemu_output_$TEST_QEMU_ARCH.log 2>&1 &
-          # fi
+          if [ "$TEST_SD_FILE" != "None" ]; then
+            dd if=/dev/zero of=$TEST_BSP_ROOT/sd.bin bs=1024 count=65536
+            mkfs.fat $TEST_BSP_ROOT/sd.bin
+          fi
 
           if [[ "${{ matrix.platform.QEMU_ARCH }}"  == "aarch64" ]]; then 
-              dd if=/dev/zero of=$TEST_BSP_ROOT/sd.bin  bs=1M count=64 status=progress || { echo "Failed to create SD image"; exit 1; }
-              mkfs.vfat  -F 32 $TEST_BSP_ROOT/sd.bin  || { echo "Failed to format SD image"; exit 1; }
-           
-              qemu-system-$TEST_QEMU_ARCH \
-                  -nographic \
-                  -M $TEST_QEMU_MACHINE \
-                  -kernel $TEST_BSP_ROOT/rtthread.bin  \
-                  -device virtio-serial-device -chardev socket,host=127.0.0.1,port=4321,server=on,wait=off,telnet=on,id=console0 -device virtserialport,chardev=console0 \
-                  -drive if=none,file=$TEST_BSP_ROOT/sd.bin,format=raw,id=blk0  -device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
-                  -netdev user,id=net0 -device virtio-net-device,netdev=net0,bus=virtio-mmio-bus.1 \
-                  > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
+            qemu-system-$TEST_QEMU_ARCH -M virt,gic-version=2 -cpu cortex-a53 -smp 4 -kernel $TEST_BSP_ROOT/rtthread.bin  -nographic \
+            -drive if=none,file=$TEST_BSP_ROOT/sd.bin,format=raw,id=blk0 -device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
+            -netdev user,id=net0 -device virtio-net-device,netdev=net0,bus=virtio-mmio-bus.1 \
+            > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
           elif [[ "${{ matrix.platform.QEMU_ARCH }}"  == "arm" ]]; then 
-              dd if=/dev/zero of=$TEST_BSP_ROOT/sd.bin  bs=1024 count=65536 || { echo "Failed to create SD image"; exit 1; }
-              mkfs.fat  $TEST_BSP_ROOT/sd.bin  || { echo "Failed to format SD image"; exit 1; }
-              qemu-system-$TEST_QEMU_ARCH \
-                  -nographic \
-                  -M $TEST_QEMU_MACHINE \
-                  -kernel $TEST_BSP_ROOT/rtthread.bin  \
-                  -nographic -sd $TEST_BSP_ROOT/sd.bin  \
-                  > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
+            qemu-system-$TEST_QEMU_ARCH \
+                -nographic \
+                -M $TEST_QEMU_MACHINE \
+                -kernel $TEST_BSP_ROOT/rtthread.bin  \
+                -sd $TEST_BSP_ROOT/sd.bin  \
+                > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
           else 
-              qemu-system-$TEST_QEMU_ARCH \
-                  -nographic \
-                  -M $TEST_QEMU_MACHINE \
-                  -kernel $TEST_BSP_ROOT/rtthread.bin  \
-                  > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
+            qemu-system-$TEST_QEMU_ARCH \
+                -nographic \
+                -M $TEST_QEMU_MACHINE \
+                -kernel $TEST_BSP_ROOT/rtthread.bin  \
+                > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
           fi 
-          
+
           QEMU_PID=$!
           disown $QEMU_PID
       
       - name: Monitor qemu log
+        shell: bash
         if: ${{ matrix.platform.RUN == 'yes' && env.TOOLCHAIN_INSTALLED != '' && success() }}
         run: |
           FAILURE_DETECTED=false
@@ -198,12 +188,12 @@ jobs:
             fi
             
             if [[ "$line" == *"[==========] [ utest    ] finished"* ]]; then
-              echo "Utest run completed. Exiting log monitoring..."
               if $FAILURE_DETECTED; then
                 echo "Error: Failures detected in logs. Below are the failure details..."
                 echo "$ERROR_LOGS"
                 exit 1
               fi
+              echo "Utest run completed. Exiting log monitoring..."
               break
             fi
           done

components/utilities/utest/utest.c

@@ -280,7 +280,6 @@ static void utest_do_run(const char *utest_name)
 
         LOG_I("[==========] [ utest    ] %d tests from %d testcase ran.", tc_run_num, tc_num);
         LOG_I("[  PASSED  ] [ result   ] %d tests.", tc_run_num - tc_fail_num);
-        LOG_I("[==========] [ utest    ] finished");
 
         if(tc_fail_list && (tc_fail_num > 0))
         {
@@ -293,6 +292,8 @@ static void utest_do_run(const char *utest_name)
                 }
             }
         }
+
+        LOG_I("[==========] [ utest    ] finished");
     }
 }