aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXeonacid <h.dwwwwww@gmail.com>2022-11-16 23:07:01 +0800
committerNirbheek Chauhan <nirbheek@centricular.com>2022-11-21 15:43:52 +0530
commitb31bd469172f52e67df9f8cb80843fa48b32a74f (patch)
treed8aab05bba2c38f1ba1ba9478fb244c111eb0b99
parent13da72318ae6a4c8874ea106f95a3ed94a0d9b94 (diff)
downloadmeson-b31bd469172f52e67df9f8cb80843fa48b32a74f.zip
meson-b31bd469172f52e67df9f8cb80843fa48b32a74f.tar.gz
meson-b31bd469172f52e67df9f8cb80843fa48b32a74f.tar.bz2
Fix test_rust_clippy for rust 1.65
clippy changed output message fix #11004
-rw-r--r--unittests/allplatformstests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 1ecbf18..6eced8e 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -4352,7 +4352,8 @@ class AllPlatformTests(BasePlatformTests):
self.init(testdir, extra_args=['--werror'], override_envvars={'RUSTC': 'clippy-driver'})
with self.assertRaises(subprocess.CalledProcessError) as cm:
self.build()
- self.assertIn('error: use of a blacklisted/placeholder name `foo`', cm.exception.stdout)
+ self.assertTrue('error: use of a blacklisted/placeholder name `foo`' in cm.exception.stdout or
+ 'error: use of a disallowed/placeholder name `foo`' in cm.exception.stdout)
@skip_if_not_language('rust')
def test_rust_rlib_linkage(self) -> None: