Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/4d-test-libs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
fi

ctest -j$N --output-on-failure -E "$excludes" --timeout 120
ctest -j1 -V --output-on-failure -E "$excludes" --timeout 120

- name: 'Windows: Run defaultlib unittests & druntime integration tests'
if: runner.os == 'Windows'
Expand All @@ -51,4 +51,4 @@ runs:
call "%LDC_VSDIR%\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }} || exit /b
echo on
cd build || exit /b
ctest -j4 --output-on-failure -E "dmd-testsuite|lit-tests|ldc2-unittest" --timeout 120 || exit /b
ctest -j1 -V --output-on-failure -E "dmd-testsuite|lit-tests|ldc2-unittest" --timeout 120 || exit /b
14 changes: 14 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,13 @@ jobs:
with:
submodules: true
fetch-depth: 50

- name: Check dash
shell: bash
run: |
/bin/sh --version || true
dpkg -s dash || true

- name: Install prerequisites
if: |
!startsWith(matrix.container_image, 'alpine')
Expand Down Expand Up @@ -190,6 +197,13 @@ jobs:
uses: ./.github/actions/4c-test-dmd
with:
arch: ${{ matrix.arch }}

- name: Check apk tool
shell: bash
run: |
command -v apk || true
apk --version || true

- name: Run defaultlib unittests & druntime integration tests
if: success() || failure()
uses: ./.github/actions/4d-test-libs
Expand Down
13 changes: 10 additions & 3 deletions runtime/druntime/test/exceptions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ ifdef IN_LDC
include ../../../../dmd/osmodel.mak
endif

$(info $(shell which apk &>/dev/null; echo $$?))
$(info $(shell which apk &>/dev/null && echo 1 ; echo $$?))
$(info $(shell command -v apk &>/dev/null ; echo $$?))
$(info $(shell command -v apk &>/dev/null && echo 1 ; echo $$?))


ifeq ($(OS),linux)
# FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
ifeq (1,$(shell which apk &>/dev/null && echo 1))
IS_MUSL:=1
endif
IS_MUSL != command -v apk &>/dev/null && echo 1
$(warning ~~~ musl $(IS_MUSL))
endif

TESTS=stderr_msg unittest_assert invalid_memory_operation static_dtor \
Expand Down Expand Up @@ -65,6 +70,8 @@ endif
ifeq ($(OS),windows)
TESTS+=winstack
endif

$(warning ~~~ All the tests are: $(TESTS))
include ../common.mak

$(ROOT)/line_trace.done: $(ROOT)/line_trace$(DOTEXE)
Expand Down
Loading