Skip to content

[lld-macho] Fix test to write to correct test dir location #137708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025

Conversation

itf
Copy link
Contributor

@itf itf commented Apr 28, 2025

(follow-up to #135241).

@llvmbot
Copy link
Member

llvmbot commented Apr 28, 2025

@llvm/pr-subscribers-lld

@llvm/pr-subscribers-lld-macho

Author: Ivan Tadeu Ferreira Antunes Filho (itf)

Changes

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

1 Files Affected:

  • (modified) lld/test/MachO/reexport-with-rpath.s (+1-1)
diff --git a/lld/test/MachO/reexport-with-rpath.s b/lld/test/MachO/reexport-with-rpath.s
index 2672449d3cdbd..91f60a69618af 100644
--- a/lld/test/MachO/reexport-with-rpath.s
+++ b/lld/test/MachO/reexport-with-rpath.s
@@ -20,7 +20,7 @@
 # RUN: %lld -dylib -install_name @rpath/two/three/libCee.dylib %t/c.o -o %t/cc/two/three/libCee.dylib 
 # RUN: %lld -dylib -install_name @rpath/two/three/libBee.dylib -L%t/cc/two/three -sub_library libCee -lCee %t/b.o -o %t/bb/two/three/libBee.dylib -rpath %t/cc
 # RUN: %lld -dylib -install_name @rpath/two/three/libAee.dylib -L%t/bb/two/three -sub_library libBee -lBee %t/a.o -o %t/aa/two/three/libAee.dylib -rpath %t/aa
-# RUN: %lld %t/main.o  -L%t/aa/two/three -lAee -o a.out -rpath %t/aa -rpath %t/bb -rpath %t/cc
+# RUN: %lld %t/main.o  -L%t/aa/two/three -lAee -o %t/a.out -rpath %t/aa -rpath %t/bb -rpath %t/cc
 
 #--- c.s
 .text

@jyknight jyknight changed the title Save a.out to temp folder [lld-macho] Fix test to not write to source-dir Apr 28, 2025
Copy link
Member

@jyknight jyknight left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've adjusted the PR description for clarity and to reference the original PR which caused the issue.

FYI, @oontvoo

@oontvoo
Copy link
Member

oontvoo commented Apr 28, 2025

Thanks!

@oontvoo
Copy link
Member

oontvoo commented Apr 28, 2025

Ivan, do you have commit access?
Or do you want me to click the merge button?

@oontvoo oontvoo changed the title [lld-macho] Fix test to not write to source-dir [lld-macho] Fix test to write to correct test dir location Apr 28, 2025
@oontvoo
Copy link
Member

oontvoo commented Apr 28, 2025

I've adjusted the PR description for clarity and to reference the original PR which caused the issue.

FYI, @oontvoo

PS: just a nit but I've updated it again to state what it does rather than what it doesn't 😄

@oontvoo oontvoo merged commit bdfa1ec into llvm:main Apr 28, 2025
14 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Apr 28, 2025

LLVM Buildbot has detected a new failure on builder llvm-clang-x86_64-gcc-ubuntu running on sie-linux-worker3 while building lld at step 6 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/174/builds/16929

Here is the relevant piece of the build log for the reference
Step 6 (test-build-unified-tree-check-all) failure: 1200 seconds without output running [b'ninja', b'check-all'], attempting to kill
...
PASS: lit :: shtest-not.py (90471 of 90481)
PASS: lit :: allow-retries.py (90472 of 90481)
PASS: lit :: discovery.py (90473 of 90481)
PASS: lit :: shtest-external-shell-kill.py (90474 of 90481)
PASS: lit :: googletest-timeout.py (90475 of 90481)
PASS: lit :: selecting.py (90476 of 90481)
PASS: lit :: shtest-timeout.py (90477 of 90481)
PASS: lit :: max-time.py (90478 of 90481)
PASS: lit :: shtest-shell.py (90479 of 90481)
PASS: lit :: shtest-define.py (90480 of 90481)
command timed out: 1200 seconds without output running [b'ninja', b'check-all'], attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=1861.511475

IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
GeorgeARM pushed a commit to GeorgeARM/llvm-project that referenced this pull request May 7, 2025
Ankur-0429 pushed a commit to Ankur-0429/llvm-project that referenced this pull request May 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants