Skip to content

Commit a41e2e3

Browse files
daanxdaanx
committed
Merge branch 'dev' into dev2
2 parents 108587b + 482a055 commit a41e2e3

7 files changed

Lines changed: 22 additions & 337 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,108 +34,108 @@ jobs:
3434
run: |
3535
cmake . -B out/debug -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
3636
cmake --build out/debug --parallel 4 --config Debug
37-
ctest --test-dir out/debug --verbose --timeout 120 -C Debug
37+
ctest --test-dir out/debug --verbose --timeout 240 -C Debug
3838
3939
- name: Release
4040
if: matrix.tests == 'basic'
4141
run: |
4242
cmake . -B out/release -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON
4343
cmake --build out/release --parallel 4 --config Release
44-
ctest --test-dir out/release --verbose --timeout 120 -C Release
44+
ctest --test-dir out/release --verbose --timeout 240 -C Release
4545
4646
- name: Secure
4747
if: matrix.tests == 'basic'
4848
run: |
4949
cmake . -B out/secure -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
5050
cmake --build out/secure --parallel 4 --config Release
51-
ctest --test-dir out/secure --verbose --timeout 120 -C Release
51+
ctest --test-dir out/secure --verbose --timeout 240 -C Release
5252
5353
# Basic, C++
5454
- name: Debug, C++
5555
if: matrix.tests == 'basic' && runner.os != 'Windows' # windows already uses C++ by default
5656
run: |
5757
cmake . -B out/debug-cxx -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_USE_CXX=ON
5858
cmake --build out/debug-cxx --parallel 8 --config Debug
59-
ctest --test-dir out/debug-cxx --verbose --timeout 120 -C Debug
59+
ctest --test-dir out/debug-cxx --verbose --timeout 240 -C Debug
6060
6161
- name: Release, C++
6262
if: matrix.tests == 'basic' && runner.os == 'Linux' # windows already uses C++ by default; macOS interpose does not work well with C++
6363
run: |
6464
cmake . -B out/release-cxx -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_USE_CXX=ON
6565
cmake --build out/release-cxx --parallel 8 --config Release
66-
ctest --test-dir out/release-cxx --verbose --timeout 120 -C Release
66+
ctest --test-dir out/release-cxx --verbose --timeout 240 -C Release
6767
6868
# Extra, Windows x86
6969
- name: Debug, Win32
7070
if: matrix.tests == 'extra' && runner.os == 'Windows' && !endsWith(matrix.os,'arm')
7171
run: |
7272
cmake . -B out/debug-x86 -DCMAKE_BUILD_TYPE=Debug -A Win32
7373
cmake --build out/debug-x86 --parallel 4 --config Debug
74-
ctest --test-dir out/debug-x86 --verbose --timeout 120 -C Debug
74+
ctest --test-dir out/debug-x86 --verbose --timeout 240 -C Debug
7575
7676
- name: Release, Win32
7777
if: matrix.tests == 'extra' && runner.os == 'Windows' && !endsWith(matrix.os,'arm')
7878
run: |
7979
cmake . -B out/release-x86 -DCMAKE_BUILD_TYPE=Release -A Win32
8080
cmake --build out/release-x86 --parallel 4 --config Release
81-
ctest --test-dir out/release-x86 --verbose --timeout 120 -C Release
81+
ctest --test-dir out/release-x86 --verbose --timeout 240 -C Release
8282
8383
- name: Debug, clang-cl
8484
if: matrix.tests == 'extra' && runner.os == 'Windows' && !endsWith(matrix.os,'arm')
8585
run: |
8686
cmake . -B out/debug-clang -DCMAKE_BUILD_TYPE=Debug -A Win32 -T ClangCl
8787
cmake --build out/debug-clang --parallel 4 --config Debug
88-
ctest --test-dir out/debug-clang --verbose --timeout 120 -C Debug
88+
ctest --test-dir out/debug-clang --verbose --timeout 240 -C Debug
8989
9090
- name: Release, clang-cl
9191
if: matrix.tests == 'extra' && runner.os == 'Windows' && !endsWith(matrix.os,'arm')
9292
run: |
9393
cmake . -B out/release-clang -DCMAKE_BUILD_TYPE=Release -A Win32 -T ClangCl
9494
cmake --build out/release-clang --parallel 4 --config Release
95-
ctest --test-dir out/release-clang --verbose --timeout 120 -C Release
95+
ctest --test-dir out/release-clang --verbose --timeout 240 -C Release
9696
9797
# Extra
9898
- name: Release, SIMD
9999
if: matrix.tests == 'extra'
100100
run: |
101101
cmake . -B out/release-simd -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_OPT_SIMD=ON
102102
cmake --build out/release-simd --parallel 8 --config Release
103-
ctest --test-dir out/release-simd --verbose --timeout 120 -C Release
103+
ctest --test-dir out/release-simd --verbose --timeout 240 -C Release
104104
105105
- name: Release, C++, SIMD
106106
if: matrix.tests == 'basic' && runner.os != 'Windows' && runner.os != 'macOS'
107107
run: |
108108
cmake . -B out/release-cxx -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_OPT_SIMD=ON -DMI_USE_CXX=ON
109109
cmake --build out/release-cxx --parallel 8 --config Release
110-
ctest --test-dir out/release-cxx --verbose --timeout 120 -C Release
110+
ctest --test-dir out/release-cxx --verbose --timeout 240 -C Release
111111
112112
- name: Debug, C++, clang++
113113
if: matrix.tests == 'extra' && runner.os == 'Linux'
114114
run: |
115115
CC=clang CXX=clang++ cmake . -B out/debug-clang-cxx -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_USE_CXX=ON
116116
cmake --build out/debug-clang-cxx --parallel 8 --config Debug
117-
ctest --test-dir out/debug-clang-cxx --verbose --timeout 120 -C Debug
117+
ctest --test-dir out/debug-clang-cxx --verbose --timeout 240 -C Debug
118118
119119
- name: Release, C++, clang++
120120
if: matrix.tests == 'extra' && runner.os == 'Linux'
121121
run: |
122122
CC=clang CXX=clang++ cmake . -B out/release-clang-cxx -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_USE_CXX=ON
123123
cmake --build out/release-clang-cxx --parallel 8 --config Release
124-
ctest --test-dir out/release-clang-cxx --verbose --timeout 120 -C Release
124+
ctest --test-dir out/release-clang-cxx --verbose --timeout 240 -C Release
125125
126126
- name: Debug, ASAN
127127
if: matrix.tests == 'extra' && runner.os == 'Linux'
128128
run: |
129129
CC=clang CXX=clang++ cmake . -B out/debug-asan -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_TRACK_ASAN=ON
130130
cmake --build out/debug-asan --parallel 8 --config Debug
131-
ctest --test-dir out/debug-asan --verbose --timeout 120 -C Debug
131+
ctest --test-dir out/debug-asan --verbose --timeout 240 -C Debug
132132
133133
- name: Debug, UBSAN
134134
if: matrix.tests == 'extra' && runner.os == 'Linux'
135135
run: |
136136
CC=clang CXX=clang++ cmake . -B out/debug-ubsan -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_DEBUG_UBSAN=ON
137137
cmake --build out/debug-ubsan --parallel 8 --config Debug
138-
ctest --test-dir out/debug-ubsan --verbose --timeout 120 -C Debug
138+
ctest --test-dir out/debug-ubsan --verbose --timeout 240 -C Debug
139139
140140
- name: Debug, TSAN
141141
if: matrix.tests == 'extra' && runner.os == 'Linux'
@@ -149,7 +149,7 @@ jobs:
149149
run: |
150150
cmake . -B out/debug-guarded -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_GUARDED=ON
151151
cmake --build out/debug-guarded --parallel 8 --config Debug
152-
ctest --test-dir out/debug-guarded --verbose --timeout 120 -C Debug
152+
ctest --test-dir out/debug-guarded --verbose --timeout 240 -C Debug
153153
env:
154154
MIMALLOC_GUARDED_SAMPLE_RATE: 100
155155

@@ -158,6 +158,6 @@ jobs:
158158
run: |
159159
cmake . -B out/resease-guarded -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_GUARDED=ON
160160
cmake --build out/resease-guarded --parallel 8 --config Release
161-
ctest --test-dir out/resease-guarded --verbose --timeout 120 -C Release
161+
ctest --test-dir out/resease-guarded --verbose --timeout 240 -C Release
162162
env:
163163
MIMALLOC_GUARDED_SAMPLE_RATE: 100

‎contrib/nuget/Microsoft.Mimalloc.nuspec‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)