Skip to content

Commit

Permalink
Investigate Win64 regression (hanging lit-tests) with latest GHA imag…
Browse files Browse the repository at this point in the history
…e (MSVC 17.9 => 17.10)
  • Loading branch information
kinke committed Jun 8, 2024
1 parent 49e5732 commit c80d34b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ commonSteps: &commonSteps
fi
# Install lit
python3 --version
python3 -m pip install --user setuptools wheel
python3 -m pip install --user setuptools wheel psutil
python3 -m pip install --user lit
python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
# Download & extract host LDC if HOST_LDC_VERSION is set
Expand Down Expand Up @@ -79,7 +79,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
Expand Down
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ common_steps_template: &COMMON_STEPS_TEMPLATE
install_lit_script: |
# Install lit
rm -f /usr/lib/python3.11/EXTERNALLY-MANAGED # required for Ubuntu 23.04
python3 -m pip install --user setuptools wheel
python3 -m pip install --user setuptools wheel psutil
python3 -m pip install --user lit
python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
clone_submodules_script: |
Expand Down Expand Up @@ -40,7 +40,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
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/1-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ runs:
set -euxo pipefail
python3 --version
if [[ '${{ runner.os }}-${{ inputs.arch }}' == 'macOS-arm64' ]]; then
brew install lit python-setuptools
brew install lit python-setuptools python-psutil
else
python3 -m pip install --user setuptools wheel
python3 -m pip install --user setuptools wheel psutil
python3 -m pip install --user lit
fi
python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/supported_llvm_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ jobs:
run: |
set -euxo pipefail
if [[ '${{ matrix.os }}' == 'macos-14' ]]; then
brew install lit python-setuptools
brew install lit python-setuptools python-psutil
else
python3 -m pip install --user setuptools wheel
python3 -m pip install --user setuptools wheel psutil
python3 -m pip install --user lit
fi
python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

0 comments on commit c80d34b

Please sign in to comment.