luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also ignore error outputs on MSRV to further simplify UI tests.

This commit is contained in:
Adam Reichold 2023-05-21 18:15:10 +02:00
parent 426e18932b
commit 8b14797403
2 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -59,7 +59,7 @@ jobs:
name: Prepare minimal package versions (MSRV only)
run: nox -s set-minimal-package-versions
- if: inputs.rust == 'nightly'
- if: inputs.rust == 'nightly' || inputs.msrv == 'MSRV'
name: Ignore changed error messages when using trybuild
run: echo "TRYBUILD=overwrite" >> "$GITHUB_ENV"

28
tests/test_compile_error.rs
View File

@ -18,12 +18,6 @@ fn test_compile_errors() {
t.compile_fail("tests/ui/invalid_pymethod_names.rs");
t.compile_fail("tests/ui/invalid_pymodule_args.rs");
t.compile_fail("tests/ui/reject_generics.rs");
tests_not_msrv(&t);
tests_nightly(&t);
#[rustversion::since(1.49)]
fn tests_not_msrv(t: &trybuild::TestCases) {
t.compile_fail("tests/ui/deprecations.rs");
t.compile_fail("tests/ui/invalid_closure.rs");
t.compile_fail("tests/ui/pyclass_send.rs");
@ -42,22 +36,14 @@ fn test_compile_errors() {
t.compile_fail("tests/ui/invalid_result_conversion.rs");
t.compile_fail("tests/ui/not_send.rs");
t.compile_fail("tests/ui/not_send2.rs");
#[cfg(not(feature = "nightly"))]
t.compile_fail("tests/ui/not_send3.rs");
t.compile_fail("tests/ui/get_set_all.rs");
t.compile_fail("tests/ui/traverse_bare_self.rs");
}
#[rustversion::before(1.49)]
fn tests_not_msrv(_t: &trybuild::TestCases) {}
#[cfg(feature = "nightly")]
fn tests_nightly(t: &trybuild::TestCases) {
t.compile_fail("tests/ui/not_send_auto_trait.rs");
t.compile_fail("tests/ui/not_send_auto_trait2.rs");
t.compile_fail("tests/ui/send_wrapper.rs");
}
#[cfg(not(feature = "nightly"))]
fn tests_nightly(_t: &trybuild::TestCases) {}
t.compile_fail("tests/ui/not_send3.rs");
#[cfg(feature = "nightly")]
t.compile_fail("tests/ui/not_send_auto_trait.rs");
#[cfg(feature = "nightly")]
t.compile_fail("tests/ui/not_send_auto_trait2.rs");
#[cfg(feature = "nightly")]
t.compile_fail("tests/ui/send_wrapper.rs");
}