Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore Windows CI on Cygwin #1203

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Restore Windows CI on Cygwin #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
os:
- macos-latest
- ubuntu-latest
- windows-latest
ocaml-compiler:
- 4.08.1
- 4.14.2
Expand All @@ -33,6 +34,9 @@ jobs:
# No longer seems to be available
- os: macos-latest
ocaml-compiler: 4.08.1
# Opam 2.2 requires at least OCaml 4.13
- os: windows-latest
ocaml-compiler: 4.08.1

runs-on: ${{ matrix.os }}

Expand Down
0 ...itv/testfile-qfbv-timeout.dolmen.expected → ...estfile-qfbv-timeout.unix.dolmen.expected
View file
Open in desktop
File renamed without changes.
0 tests/bitv/testfile-qfbv-timeout.dolmen.smt2 → ...tv/testfile-qfbv-timeout.unix.dolmen.smt2
View file
Open in desktop
File renamed without changes.
9 changes: 8 additions & 1 deletion tools/gentest.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ module Test : sig
filters: string list option;
compare_should_succeed: bool;
accepted_exit_codes: int list;
ignore: bool;
}

type t = private {
Expand Down Expand Up @@ -142,6 +143,7 @@ end = struct
filters: string list option;
compare_should_succeed: bool;
accepted_exit_codes: int list;
ignore: bool;
}

type t = {
Expand All @@ -157,6 +159,7 @@ end = struct
filters = None;
compare_should_succeed = true;
accepted_exit_codes = [0];
ignore = false;
}

let make ~cmd ~pb_file ~params ~root ~path =
Expand Down Expand Up @@ -250,6 +253,10 @@ end = struct
List.fold_left (
fun (acc : Test.params) ->
function
| "unix" when not Sys.unix -> {
acc with
ignore = true
}
| "fail" ->
{acc with compare_should_succeed = false}
| "err" ->
Expand Down Expand Up @@ -277,7 +284,7 @@ end = struct
(String.split_on_char '.' pb_file)
in
List.fold_left (fun acc2 cmd ->
if filter params cmd then
if not params.ignore && filter params cmd then
Test.make ~cmd ~pb_file ~params ~root ~path :: acc2
else
acc2
Expand Down
Loading