From ffe4ccd4ad1a96239b82b700a626a3644ddc364d Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Fri, 14 Apr 2023 11:40:07 +0200 Subject: rename rust-lldb to needs-rust-lldb for consistency --- src/tools/compiletest/src/header.rs | 8 -------- src/tools/compiletest/src/header/needs.rs | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 7613508077f..ac659c89405 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -943,14 +943,6 @@ pub fn make_test_description( } } - if config.debugger == Some(Debugger::Lldb) && !config.lldb_native_rust { - if config.parse_name_directive(ln, "rust-lldb") { - decision!(IgnoreDecision::Ignore { - reason: "ignored on targets wihtout Rust's LLDB".into() - }); - } - } - should_fail |= config.parse_name_directive(ln, "should-fail"); }); diff --git a/src/tools/compiletest/src/header/needs.rs b/src/tools/compiletest/src/header/needs.rs index 9a7c4b86115..8b42ef5db59 100644 --- a/src/tools/compiletest/src/header/needs.rs +++ b/src/tools/compiletest/src/header/needs.rs @@ -1,4 +1,4 @@ -use crate::common::Config; +use crate::common::{Config, Debugger}; use crate::header::IgnoreDecision; use crate::util; @@ -100,6 +100,11 @@ pub(super) fn handle_needs( condition: cache.rust_lld, ignore_reason: "ignored on targets without Rust's LLD", }, + Need { + name: "needs-rust-lldb", + condition: config.debugger != Some(Debugger::Lldb) || config.lldb_native_rust, + ignore_reason: "ignored on targets without Rust's LLDB", + }, Need { name: "needs-i686-dlltool", condition: cache.i686_dlltool, -- cgit 1.4.1-3-g733a5