unable to compile compiletest on 1.32.0 stable

[semarie]

on OpenBSD, while preparing the port of rust-1.32.0 (stable 9fda7c2), I have an compilation error on compiletest while running the test target:

error[E0308]: mismatched types
   --> src/tools/compiletest/src/main.rs:514:22
    |
514 |         run_ignored: config.run_ignored,
    |                      ^^^^^^^^^^^^^^^^^^ expected enum `test::RunIgnored`, found bool
    |
    = note: expected type `test::RunIgnored`
               found type `bool`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.
error: Could not compile `compiletest`.

Caused by:
  process didn't exit successfully: `/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/bootstrap/debug/rustc --crate-name compiletest src/tools/compiletest/src/main.rs --color never --error-format json --crate-type bin --emit=dep-info,link -C opt-level=2 -C metadata=102678fba0af31c6 -C extra-filename=-102678fba0af31c6 --out-dir /data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps --target x86_64-unknown-openbsd -L dependency=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps -L dependency=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/release/deps --extern diff=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libdiff-44e71cdbcf00c5db.rlib --extern env_logger=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libenv_logger-f3c41cf305387131.rlib --extern filetime=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libfiletime-7e3e4a8e80106ac4.rlib --extern getopts=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libgetopts-adbca7d872be9ba4.rlib --extern lazy_static=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/liblazy_static-5eacaf71a502774a.rlib --extern libc=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/liblibc-40441d551595c6ac.rlib --extern log=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/liblog-217a52ee3b636af3.rlib --extern regex=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libregex-bbf2db42f6722251.rlib --extern rustfix=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/librustfix-55cf71147694af0b.rlib --extern serde=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libserde-4d7a678ad431e87d.rlib --extern serde_derive=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/release/deps/libserde_derive-117ee5442516e8e1.so --extern serde_json=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/deps/libserde_json-345a38a92a03dc90.rlib -L native=/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/build-amd64/build/x86_64-unknown-openbsd/stage0-bootstrap-tools/x86_64-unknown-openbsd/release/build/backtrace-sys-0f6d0b9f5fc30b19/out` (exit code: 1)
command did not execute successfully: "/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/rustc-bootstrap-amd64-1.32.0-20190117/bin/cargo" "build" "--target" "x86_64-unknown-openbsd" "-j" "1" "-v" "--release" "--frozen" "--manifest-path" "/data/semarie/repos/openbsd/ports/pobj/rust-1.32.0/rustc-1.32.0-src/src/tools/compiletest/Cargo.toml" "--message-format" "json"
expected success, got: exit code: 101

Full log: https://p.iotek.org/hfe

My source tree is slightly patched to accomodate OpenBSD specificities, but none in compiletest (except currently one to workaround this specific problem). If it matters, the list of patches for 1.32.0 is available on my wip tree https://bitbucket.org/semarie/rust-ports/src/tip/patches/?at=default .

I am reproducing it on two differents hosts (amd64 and i686)

[semarie]

if it matters, I am using rustc-1.32.0 to compile rustc-1.32.0. So compiletest is build using rustc-1.32.0:

$ rustc -vV
rustc 1.32.0
binary: rustc
commit-hash: unknown
commit-date: unknown
host: x86_64-unknown-openbsd
release: 1.32.0
LLVM version: 6.0

[mati865]

It was missed in #55053 and fixed by #56536

Your patch is correct, maybe it could be backported if there is point release planned.