Skip to content

Commit 3e6a6ab

Browse files
committed
Restore tsan behavior, update cross platform action version.
1 parent 574d4f6 commit 3e6a6ab

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

.github/workflows/freebsd-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
fetch-depth: 0
4444

4545
- name: Run FreeBSD VM
46-
uses: cross-platform-actions/action@v1.1.0
46+
uses: cross-platform-actions/action@v1.3.0
4747
with:
4848
operating_system: freebsd
4949
version: 14.2

.github/workflows/haiku-test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,14 @@ jobs:
3131
fetch-depth: 0
3232

3333
- name: Run Haiku VM
34-
uses: cross-platform-actions/action@v1.2.0
34+
uses: cross-platform-actions/action@v1.3.0
3535
with:
3636
operating_system: haiku
3737
version: r1beta5
3838
architecture: ${{ matrix.arch }}
3939
shell: sh
4040
run: |
4141
sh ./tools/metacall-environment.sh base
42-
4342
mkdir -p build && cd build
44-
4543
sh ../tools/metacall-configure.sh ${{ matrix.build }} scripts tests
46-
4744
sh ../tools/metacall-build.sh ${{ matrix.build }} tests || sh ../tools/metacall-haiku-crash-report.sh

cmake/CompileOptions.cmake

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,15 @@ endif()
112112
# ThreadSanitizer is incompatible with AddressSanitizer and LeakSanitizer
113113
if(OPTION_BUILD_THREAD_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
114114
set(SANITIZER_LIBRARIES -ltsan)
115-
set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES
116-
"TSAN_OPTIONS=verbosity=1:halt_on_error=1:history_size=7:report_signal_unsafe=1:report_thread_leaks=1:second_deadlock_stack=1:symbolize=1:suppressions=${CMAKE_SOURCE_DIR}/source/tests/sanitizer/tsan.supp"
117-
)
115+
if(PROJECT_OS_BSD)
116+
set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES
117+
"TSAN_OPTIONS=suppressions=${CMAKE_SOURCE_DIR}/source/tests/sanitizer/tsan.supp"
118+
)
119+
else()
120+
set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES
121+
"TSAN_OPTIONS=verbosity=1:halt_on_error=1:history_size=7:report_signal_unsafe=1:report_thread_leaks=1:second_deadlock_stack=1:symbolize=1:suppressions=${CMAKE_SOURCE_DIR}/source/tests/sanitizer/tsan.supp"
122+
)
123+
endif()
118124
set(SANITIZER_COMPILE_DEFINITIONS
119125
"__THREAD_SANITIZER__=1"
120126
)

tools/metacall-environment.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ sub_base(){
164164
brew install llvm cmake git wget gnupg ca-certificates
165165
elif [ "${OPERATIVE_SYSTEM}" = "FreeBSD" ]; then
166166
$SUDO_CMD pkg install -y cmake git gmake wget gnupg ca_root_nss
167-
168-
# Disable memory limits and enable debug memory mappings
169-
$SUDO_CMD ulimit -v unlimited
170-
$SUDO_CMD sysctl security.bsd.unprivileged_proc_debug=1
171167
elif [ "${OPERATIVE_SYSTEM}" = "Haiku" ]; then
172168
pkgman install -y cmake git make wget getconf gcc_syslibs_devel
173169

0 commit comments

Comments
 (0)