Skip to content

Conversation

@paschalis-mpeis
Copy link
Member

PR #139953 used DONTRUN to disable some run lines, but that didn't work. Now switching to RUN-DISABLED for disabling the tests until llvm-nm support is landed (#138232).

PR #139953 used `DONTRUN` to disable some run lines, but that
didn't work. Now switching to `RUN-DISABLED` for disabling the
tests until llvm-nm support is  landed (#138232).
@llvmbot
Copy link
Member

llvmbot commented May 15, 2025

@llvm/pr-subscribers-bolt

Author: Paschalis Mpeis (paschalis-mpeis)

Changes

PR #139953 used DONTRUN to disable some run lines, but that didn't work. Now switching to RUN-DISABLED for disabling the tests until llvm-nm support is landed (#138232).


Full diff: https://github.com/llvm/llvm-project/pull/140026.diff

1 Files Affected:

  • (modified) bolt/test/X86/callcont-fallthru.s (+3-3)
diff --git a/bolt/test/X86/callcont-fallthru.s b/bolt/test/X86/callcont-fallthru.s
index 7799e017691f6..4994cfb541eef 100644
--- a/bolt/test/X86/callcont-fallthru.s
+++ b/bolt/test/X86/callcont-fallthru.s
@@ -6,7 +6,7 @@
 # RUN: %clangxx %cxxflags %s %t.so -o %t -Wl,-q -nostdlib
 # RUN: link_fdata %s %t %t.pat PREAGGT1
 # RUN: link_fdata %s %t %t.pat2 PREAGGT2
-# DONTRUN: link_fdata %s %t %t.patplt PREAGGPLT
+# RUN-DISABLED: link_fdata %s %t %t.patplt PREAGGPLT
 
 # RUN: llvm-strip --strip-unneeded %t -o %t.strip
 # RUN: llvm-objcopy --remove-section=.eh_frame %t.strip %t.noeh
@@ -26,8 +26,8 @@
 
 ## Check pre-aggregated traces don't report zero-sized PLT fall-through as
 ## invalid trace
-# DONTRUN: llvm-bolt %t.strip --pa -p %t.patplt -o %t.out | FileCheck %s \
-# DONTRUN:   --check-prefix=CHECK-PLT
+# RUN-DISABLED: llvm-bolt %t.strip --pa -p %t.patplt -o %t.out | FileCheck %s \
+# RUN-DISABLED:   --check-prefix=CHECK-PLT
 # CHECK-PLT: traces mismatching disassembled function contents: 0
 
   .globl foo

@paschalis-mpeis paschalis-mpeis changed the title [BOLT][test] Fix disable PLT check in callcont-fallthru [BOLT][test] Fix disabling of the PLT check in callcont-fallthru May 15, 2025
@paschalis-mpeis
Copy link
Member Author

paschalis-mpeis commented May 15, 2025

Hey @aaupov,

It turns out that ANYTHING-RUN: still executes those lines.
Apologies for not manually checking with the buildbot – we need those pre-merge tests too!

Shall we proceed with this patch?

@paschalis-mpeis paschalis-mpeis merged commit 6090c0e into main May 15, 2025
12 checks passed
@paschalis-mpeis paschalis-mpeis deleted the users/paschalis-mpeis/fix-disabling-callcont branch May 15, 2025 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants