diff --git a/.circleci/config.yml b/.circleci/config.yml index fbb2396d3a..b02960ff86 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ commonSteps: &commonSteps fi # Install lit python3 --version - python3 -m pip install --user lit + python3 -m pip install --user lit psutil python3 -c "import lit.main; lit.main.main();" --version . | head -n 1 # Download & extract host LDC if HOST_LDC_VERSION is set if [[ -v HOST_LDC_VERSION ]]; then @@ -78,7 +78,7 @@ commonSteps: &commonSteps - run: name: Run LIT testsuite when: always - command: cd ../build/tests && python3 runlit.py -v -j $PARALLELISM . + command: cd ../build/tests && python3 runlit.py -v -j $PARALLELISM . --timeout 60 - run: name: Run DMD testsuite when: always diff --git a/.cirrus.yml b/.cirrus.yml index 6d7c373f98..42508a1350 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ common_steps_template: &COMMON_STEPS_TEMPLATE install_lit_script: | # Install lit rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED # required for Ubuntu 24.04 - python3 -m pip install --user lit + python3 -m pip install --user lit psutil python3 -c "import lit.main; lit.main.main();" --version . | head -n 1 clone_submodules_script: | cd $CIRRUS_WORKING_DIR @@ -39,7 +39,7 @@ common_steps_template: &COMMON_STEPS_TEMPLATE rm $CIRRUS_WORKING_DIR/tests/debuginfo/nested_gdb.d rm $CIRRUS_WORKING_DIR/tests/sanitizers/fuzz_basic.d fi - python3 runlit.py -v -j $PARALLELISM . + python3 runlit.py -v -j $PARALLELISM . --timeout 60 run_dmd_testsuite_script: | cd $CIRRUS_WORKING_DIR/../build DMD_TESTSUITE_MAKE_ARGS=-j$PARALLELISM ctest -V -R dmd-testsuite diff --git a/.github/actions/1-setup/action.yml b/.github/actions/1-setup/action.yml index 3263ed0ded..3320ce31bc 100644 --- a/.github/actions/1-setup/action.yml +++ b/.github/actions/1-setup/action.yml @@ -122,9 +122,9 @@ runs: set -euxo pipefail python3 --version if [[ '${{ runner.os }}-${{ inputs.arch }}' == 'macOS-arm64' ]]; then - brew install lit + brew install lit python-psutil else - python3 -m pip install --user lit + python3 -m pip install --user lit psutil fi python3 -c "import lit.main; lit.main.main();" --version . | head -n 1 diff --git a/.github/workflows/supported_llvm_versions.yml b/.github/workflows/supported_llvm_versions.yml index e6c3c6f547..b833df1e57 100644 --- a/.github/workflows/supported_llvm_versions.yml +++ b/.github/workflows/supported_llvm_versions.yml @@ -58,9 +58,9 @@ jobs: run: | set -euxo pipefail if [[ '${{ matrix.os }}' == 'macos-14' ]]; then - brew install lit + brew install lit python-psutil else - python3 -m pip install --user lit + python3 -m pip install --user lit psutil fi python3 -c "import lit.main; lit.main.main();" --version . | head -n 1 - name: 'Linux: Install gdb, llvm-symbolizer and libzstd' diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 39be385f5d..e6225b6c44 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,5 +28,5 @@ configure_file(lit.site.cfg.in lit.site.cfg ) configure_file(runlit.py runlit.py COPYONLY) add_test(NAME lit-tests - COMMAND ${PYTHON_EXE} runlit.py -v . + COMMAND ${PYTHON_EXE} runlit.py -v . --timeout 60 )