From 1666375782fb1972ababbeea3aa9b7e8bbd59737 Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Thu, 30 Nov 2023 18:19:07 -0500 Subject: [PATCH] make checks in one --- .github/workflows/parallel_tests.yml | 23 +++-------------------- panda/python/tests/run_all_tests.sh | 22 +++++++++++++++++----- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.github/workflows/parallel_tests.yml b/.github/workflows/parallel_tests.yml index 68d402e1a44..6845c96153f 100644 --- a/.github/workflows/parallel_tests.yml +++ b/.github/workflows/parallel_tests.yml @@ -87,25 +87,8 @@ jobs: - test_type: "pypanda" test_script: "all" - test_type: "make_check" - test_script: "check-qtest-x86_64" - - test_type: "make_check" - test_script: "check-qtest-i386" - - test_type: "make_check" - test_script: "check-qtest-arm" - - test_type: "make_check" - test_script: "check-qtest-mips" - - test_type: "make_check" - test_script: "check-qtest-mipsel" - - test_type: "make_check" - test_script: "check-qtest-ppc" - - test_type: "make_check" - test_script: "check-block" - - test_type: "make_check" - test_script: "check-unit" - - test_type: "make_check" - test_script: "check-qapi-schema" - - + test_script: "all" + steps: # Given a container with PANDA installed at /panda, run the taint tests - name: Update @@ -156,7 +139,7 @@ jobs: docker run --name panda_test_${{ matrix.test_script }}_${GITHUB_RUN_ID} -e PANDA_TEST=yes --cap-add SYS_NICE --rm -t "ghcr.io/${{ github.repository_owner }}/panda_local:${{ github.sha }}" bash -c - "cd /panda/build && make ${{ matrix.test_script }}" + "cd /panda/build && make check" cleanup: # Cleanup after prior jobs finish - even if they fail diff --git a/panda/python/tests/run_all_tests.sh b/panda/python/tests/run_all_tests.sh index 38a4b05dd22..f05a5a0d754 100644 --- a/panda/python/tests/run_all_tests.sh +++ b/panda/python/tests/run_all_tests.sh @@ -1,10 +1,22 @@ #!/bin/bash -# Iterate over all Python test scripts and execute them -for test_script in /panda/panda/python/tests/*.py; do - echo "Running $test_script..." - python3 "$test_script" + +# Define the list of test scripts to run +declare -a tests=("dyn_hooks" "copy_test" "file_fake" "file_hook" "generic_tests" "monitor_cmds" "multi_proc_cbs" "sleep_in_cb" "syscalls" "record_no_snap" "sig_suppress") + +# Base directory for test scripts +TEST_DIR="/panda/panda/python/tests" + +# Iterate over the test scripts array +for test_script in "${tests[@]}"; do + # Construct the full path to the script + full_script_path="$TEST_DIR/${test_script}.py" + + echo "Running $full_script_path..." + python3 "$full_script_path" + + # Check the exit status of the script if [ $? -ne 0 ]; then - echo "Test $test_script failed" + echo "Test $full_script_path failed" exit 1 fi done