Skip to content

Commit 06a3e16

Browse files
committed
Purge winbug from regression tests
We no longer use or need this label for all tests have been made to pass on Windows (when we expect them to).
1 parent b3f1e71 commit 06a3e16

File tree

4 files changed

+7
-32
lines changed

4 files changed

+7
-32
lines changed

regression/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,3 @@ This folder contains the CProver regression test-suite.
2525
These tests are known to not work with Z3 (the version running on our CI).
2626
- `thorough-z3-smt-backend`:
2727
These tests are too slow to be run in CI with Z3.
28-
29-
### Platform
30-
31-
- `winbug`:
32-
These tests are currently known to be failing on Windows,
33-
but passing on other platforms. https://github.com/diffblue/cbmc/pull/5572
34-
will address one part thereof; the remaining ones are C++ tests that fail on
35-
both Windows and MacOS for our lack of C++-11 support.

regression/book-examples/CMakeLists.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
22
set(gcc_only -X gcc-only)
3-
set(gcc_only_string "-X;gcc-only;")
4-
set(exclude_win_broken_tests -X winbug)
5-
# We add the string at the end of the exclusion list, so it must not
6-
# have the `;` at the end or it bugs out.
7-
set(exclude_win_broken_tests_string "-X;winbug")
3+
set(gcc_only_string "-X;gcc-only")
84
else()
95
set(gcc_only "")
106
set(gcc_only_string "")
11-
set(exclude_win_broken_tests "")
12-
set(exclude_win_broken_tests_string "")
137
endif()
148

159
add_test_pl_tests(
16-
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" -X smt-backend ${gcc_only} ${exclude_win_broken_tests}
10+
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" -X smt-backend ${gcc_only}
1711
)
1812

1913
add_test_pl_profile(
2014
"book-examples-paths-lifo"
2115
"$<TARGET_FILE:cbmc> --paths lifo"
22-
"-C;-X;thorough-paths;-X;smt-backend;-X;paths-lifo-expected-failure;${gcc_only_string}-s;paths-lifo;${exclude_win_broken_tests_string}"
16+
"-C;-X;thorough-paths;-X;smt-backend;-X;paths-lifo-expected-failure;${gcc_only_string}-s;paths-lifo"
2317
"CORE"
2418
)
2519

2620
add_test_pl_profile(
2721
"book-examples-cprover-smt2"
2822
"$<TARGET_FILE:cbmc> --cprover-smt2"
29-
"-C;-X;broken-smt-backend;-X;thorough-smt-backend;-X;broken-cprover-smt-backend;-X;thorough-cprover-smt-backend;${gcc_only_string}-s;cprover-smt2;${exclude_win_broken_tests_string}"
23+
"-C;-X;broken-smt-backend;-X;thorough-smt-backend;-X;broken-cprover-smt-backend;-X;thorough-cprover-smt-backend;${gcc_only_string}-s;cprover-smt2"
3024
"CORE"
3125
)
3226

regression/cbmc/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
22
set(gcc_only -X gcc-only)
33
set(gcc_only_string "-X;gcc-only;")
4-
set(exclude_win_broken_tests -X winbug)
5-
# We add the string at the end of the exclusion list, so it must not
6-
# have the `;` at the end or it bugs out.
7-
set(exclude_win_broken_tests_string "-X;winbug")
84
else()
95
set(gcc_only "")
106
set(gcc_only_string "")
11-
set(exclude_win_broken_tests "")
12-
set(exclude_win_broken_tests_string "")
137
endif()
148

159
add_test_pl_tests(
16-
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" -X smt-backend ${gcc_only} ${exclude_win_broken_tests}
10+
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" -X smt-backend ${gcc_only}
1711
)
1812

1913
add_test_pl_profile(
2014
"cbmc-paths-lifo"
2115
"$<TARGET_FILE:cbmc> --paths lifo"
22-
"-C;-X;thorough-paths;-X;smt-backend;-X;paths-lifo-expected-failure;${gcc_only_string}-s;paths-lifo;${exclude_win_broken_tests_string}"
16+
"-C;-X;thorough-paths;-X;smt-backend;-X;paths-lifo-expected-failure;${gcc_only_string}-s;paths-lifo"
2317
"CORE"
2418
)
2519

2620
add_test_pl_profile(
2721
"cbmc-cprover-smt2"
2822
"$<TARGET_FILE:cbmc> --cprover-smt2"
29-
"-C;-X;broken-smt-backend;-X;thorough-smt-backend;-X;broken-cprover-smt-backend;-X;thorough-cprover-smt-backend;${gcc_only_string}-s;cprover-smt2;${exclude_win_broken_tests_string}"
23+
"-C;-X;broken-smt-backend;-X;thorough-smt-backend;-X;broken-cprover-smt-backend;-X;thorough-cprover-smt-backend;${gcc_only_string}-s;cprover-smt2"
3024
"CORE"
3125
)
3226

regression/cbmc/export-symex-ready-goto/test-bad-usage.desc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,3 @@ test.c
88
--
99
Ensure that --export-symex-ready-goto exported.symex-ready.goto terminates
1010
with error when incorrectly used.
11-
12-
The reason why we use `winbug` is that it fails on certain windows system
13-
probably due to different interpretation of "". Not a bug, but we're using
14-
that label to remain consistent with other parts of the codebase, and not
15-
to unnecessarily introduce new ones for simple use cases.

0 commit comments

Comments
 (0)