Merge pull request #121 from finagolfin/rpath

bnbarham · web-flow · commit 9ea82729266c · 2023-08-31T10:29:38.000-07:00
Update the ELF liblldb.so runpath for swiftlang/llvm-project#7359
diff --git a/test-snapshot-binaries/test-rpath-linux.py b/test-snapshot-binaries/test-rpath-linux.py
@@ -38,7 +38,7 @@
 # CHECK-SDE-NOT: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}:/usr/lib/swift/linux
 #
 # RUN: %{readelf} -d %{package_path}/usr/lib/liblldb.so | %{FileCheck} --check-prefix CHECK-LLDB %s
-# CHECK-LLDB: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}$ORIGIN/swift/linux
+# CHECK-LLDB: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}$ORIGIN/../lib/swift/linux
 #
 # RUN: find %{package_path} -name "lib*\.so" | xargs %{readelf} -d | %{FileCheck} --check-prefix CHECK-LIB %s
 # CHECK-LIB-NOT: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}/home/

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`# CHECK-SDE-NOT: {{.}} {{\(RPATH\)\|\(RUNPATH\)}} {{.}}:/usr/lib/swift/linux`
`39`	`39`	`#`
`40`	`40`	`# RUN: %{readelf} -d %{package_path}/usr/lib/liblldb.so \| %{FileCheck} --check-prefix CHECK-LLDB %s`
`41`		`-# CHECK-LLDB: {{.}} {{\(RPATH\)\|\(RUNPATH\)}} {{.}}$ORIGIN/swift/linux`
	`41`	`+# CHECK-LLDB: {{.}} {{\(RPATH\)\|\(RUNPATH\)}} {{.}}$ORIGIN/../lib/swift/linux`
`42`	`42`	`#`
`43`	`43`	`# RUN: find %{package_path} -name "lib*\.so" \| xargs %{readelf} -d \| %{FileCheck} --check-prefix CHECK-LIB %s`
`44`	`44`	`# CHECK-LIB-NOT: {{.}} {{\(RPATH\)\|\(RUNPATH\)}} {{.}}/home/`