Skip to content

Commit caf24ec

Browse files
NlightNFotisNlightNFotis
committed
Deactivate three broken tests on MacOS.
The reason we are deactivating the tests is that there was a change to the `assert.h` header under MacOS that makes it now include some other C++ headers which include `type_traits` causing template errors that have broken CI under that platform.
1 parent a46f12d commit caf24ec

File tree

20 files changed

+69
-34
lines changed

20 files changed

+69
-34
lines changed

‎regression/ansi-c/CMakeLists.txt

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
2-
add_test_pl_tests(
3-
"$<TARGET_FILE:goto-cc>" -X gcc-only
4-
)
2+
add_test_pl_tests(
3+
"$<TARGET_FILE:goto-cc>" -X gcc-only
4+
)
5+
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
6+
add_test_pl_tests(
7+
"$<TARGET_FILE:goto-cc>" -X macos-assert-broken
8+
)
59
else()
6-
add_test_pl_tests(
7-
"$<TARGET_FILE:goto-cc>"
8-
)
9-
add_test_pl_profile(
10-
"ansi-c-c++-front-end"
11-
"$<TARGET_FILE:goto-cc> -xc++ -D_Bool=bool"
12-
"-C;-I;test-c++-front-end;-s;c++-front-end"
13-
"CORE"
14-
)
10+
add_test_pl_tests(
11+
"$<TARGET_FILE:goto-cc>"
12+
)
13+
14+
add_test_pl_profile(
15+
"ansi-c-c++-front-end"
16+
"$<TARGET_FILE:goto-cc> -xc++ -D_Bool=bool"
17+
"-C;-I;test-c++-front-end;-s;c++-front-end"
18+
"CORE"
19+
)
1520
endif()

‎regression/ansi-c/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,22 @@ else
99
exe=../../../src/goto-cc/goto-cc
1010
endif
1111

12+
ifeq ($(OS), Darwin)
13+
exclude_mac_broken_tests = -X macos-assert-broken
14+
else
15+
exclude_mac_broken_tests =
16+
endif
17+
1218
test:
1319
@../test.pl -e -p -c $(exe)
1420
ifneq ($(BUILD_ENV_),MSVC)
15-
@../test.pl -e -p -c "$(exe) -xc++ -D_Bool=bool" -I test-c++-front-end -s c++-front-end
21+
@../test.pl -e -p -c "$(exe) -xc++ -D_Bool=bool" -I test-c++-front-end -s c++-front-end $(exclude_mac_broken_tests)
1622
endif
1723

1824
tests.log: ../test.pl
1925
@../test.pl -e -p -c $(exe)
2026
ifneq ($(BUILD_ENV_),MSVC)
21-
@../test.pl -e -p -c "$(exe) -xc++ -D_Bool=bool" -I test-c++-front-end -s c++-front-end
27+
@../test.pl -e -p -c "$(exe) -xc++ -D_Bool=bool" -I test-c++-front-end -s c++-front-end $(exclude_mac_broken_tests)
2228
endif
2329

2430
show:

‎regression/ansi-c/array_initialization2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE test-c++-front-end
1+
CORE test-c++-front-end macos-assert-broken
22
main.c
33

44
^EXIT=0$

‎regression/ansi-c/float_constant2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE test-c++-front-end
1+
CORE test-c++-front-end macos-assert-broken
22
main.c
33

44
^EXIT=0$

‎regression/ansi-c/goto_convert_switch_range_case_valid/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE test-c++-front-end
1+
CORE test-c++-front-end macos-assert-broken
22
main.c
33

44
^EXIT=0$

‎regression/cbmc-cpp/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ else()
1010
set(exclude_win_broken_tests "")
1111
endif()
1212

13+
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
14+
set(exclude_mac_broken_tests -X macos-assert-broken)
15+
else()
16+
set(exclude_mac_broken_tests "")
17+
endif()
18+
1319
add_test_pl_tests(
14-
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" ${gcc_only} ${exclude_win_broken_tests}
20+
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" ${gcc_only} ${exclude_win_broken_tests} ${exclude_mac_broken_tests}
1521
)

‎regression/cbmc-cpp/FunctionParam1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE
1+
CORE macos-assert-broken
22
main.cpp
33

44
^EXIT=0$

‎regression/cbmc-cpp/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ else
99
gcc_only =
1010
endif
1111

12+
ifeq ($(OS), Darwin)
13+
exclude_mac_broken_tests = -X macos-assert-broken
14+
else
15+
exclude_mac_broken_tests =
16+
endif
17+
1218
test:
13-
@../test.pl -e -p -c "../../../src/cbmc/cbmc --validate-goto-model --validate-ssa-equation" $(gcc_only)
19+
@../test.pl -e -p -c "../../../src/cbmc/cbmc --validate-goto-model --validate-ssa-equation" $(gcc_only) $(exclude_mac_broken_tests)
1420

1521
tests.log: ../test.pl
16-
@../test.pl -e -p -c "../../../src/cbmc/cbmc --validate-goto-model --validate-ssa-equation" $(gcc_only)
22+
@../test.pl -e -p -c "../../../src/cbmc/cbmc --validate-goto-model --validate-ssa-equation" $(gcc_only) $(exclude_mac_broken_tests)
1723

1824
show:
1925
@for dir in *; do \

‎regression/cbmc-cpp/MethodParam1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE
1+
CORE macos-assert-broken
22
main.cpp
33

44
instance is SATISFIABLE$

‎regression/cbmc-cpp/cpp-new/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE winbug
1+
CORE winbug macos-assert-broken
22
main.cpp
33
--pointer-check
44
^EXIT=0$

0 commit comments

Comments
 (0)