This is an archive of the discontinued LLVM Phabricator instance.

Differential D112322

[libunwind] Fix path to libunwind for per-target-runtime-dir builds
ClosedPublic

Authored by ldionne on Oct 22 2021, 9:05 AM.

Details

Reviewers
steven_wu
Group Reviewers
Restricted Project
Commits
rGe6f39c8b4891: [libunwind] Fix path to libunwind for per-target-runtime-dir builds
Summary

We recently introduced a from-scratch config to run the libunwind tests.
However, that config was always looking for libunwind in <install>/lib,
and never in <install>/<target>/lib, which is necessary for tests to
work when the per-target-runtime-dir configuration is enabled.

This commit fixes that. I believe this is what caused the CI failures we
saw after 5a8ad80b6fa5 and caused it to be reverted.

Diff Detail

Unit TestsFailed

TimeTest
400 mslibcxx CI C++03 > llvm-libc++-shared-cfg-in.std/utilities/smartptr/unique_ptr/unique_ptr_class/unique_ptr_observers::dereference.runtime.fail.cpp
410 mslibcxx CI C++03 > llvm-libc++-shared-cfg-in.std/utilities/smartptr/unique_ptr/unique_ptr_class/unique_ptr_observers::op_arrow.runtime.fail.cpp
480 mslibcxx CI C++11 > llvm-libc++-shared-cfg-in.std/utilities/smartptr/unique_ptr/unique_ptr_class/unique_ptr_observers::dereference.runtime.fail.cpp
480 mslibcxx CI C++11 > llvm-libc++-shared-cfg-in.std/utilities/smartptr/unique_ptr/unique_ptr_class/unique_ptr_observers::op_arrow.runtime.fail.cpp
490 mslibcxx CI C++14 > llvm-libc++-shared-cfg-in.std/utilities/smartptr/unique_ptr/unique_ptr_class/unique_ptr_observers::dereference.runtime.fail.cpp
View Full Test Results (14 Failed)

Event Timeline

ldionne created this revision.Oct 22 2021, 9:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 22 2021, 9:05 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne requested review of this revision.Oct 22 2021, 9:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 22 2021, 9:05 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
steven_wu accepted this revision as: steven_wu.Oct 22 2021, 9:12 AM
steven_wu added a subscriber: steven_wu.

LGTM. Can you use a better commit message?

Harbormaster completed remote builds in B130156: Diff 381571.Oct 22 2021, 9:23 AM
ldionne updated this revision to Diff 381588.Oct 22 2021, 9:50 AM

Rebase onto main after fixing tests

ldionne edited the summary of this revision. (Show Details)Oct 22 2021, 10:05 AM
Harbormaster completed remote builds in B130170: Diff 381588.Oct 22 2021, 11:10 AM
ldionne accepted this revision as: Restricted Project.Oct 22 2021, 11:35 AM

Only the non-libcxx CI is failing, so I'll ship this.

This revision is now accepted and ready to land.Oct 22 2021, 11:35 AM
This revision was landed with ongoing or failed builds.Oct 22 2021, 11:36 AM
Closed by commit rGe6f39c8b4891: [libunwind] Fix path to libunwind for per-target-runtime-dir builds (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGe6f39c8b4891: [libunwind] Fix path to libunwind for per-target-runtime-dir builds.

Revision Contents

PathSize
libunwind/
test/
configs/
2 lines
2 lines

Diff 381571

libunwind/test/configs/llvm-libunwind-shared.cfg.in

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@')) config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
config.substitutions.append(('%{flags}', config.substitutions.append(('%{flags}',
'-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else '' '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
)) ))
config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags)) '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
)) ))
config.substitutions.append(('%{link_flags}', config.substitutions.append(('%{link_flags}',
'-nodefaultlibs -L {0}/lib -Wl,-rpath,{0}/lib -lunwind -ldl -lc {1}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags)) '-nodefaultlibs -L {0} -Wl,-rpath,{0} -lunwind -ldl -lc {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
)) ))
config.substitutions.append(('%{exec}', config.substitutions.append(('%{exec}',
'{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@') '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')
)) ))
import os, site import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
libcxx.test.newconfig.configure( libcxx.test.newconfig.configure(
libcxx.test.params.DEFAULT_PARAMETERS, libcxx.test.params.DEFAULT_PARAMETERS,
libcxx.test.features.DEFAULT_FEATURES, libcxx.test.features.DEFAULT_FEATURES,
config, config,
lit_config lit_config
) )

libunwind/test/configs/llvm-libunwind-static.cfg.in

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@')) config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
config.substitutions.append(('%{flags}', config.substitutions.append(('%{flags}',
'-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else '' '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
)) ))
config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags)) '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
)) ))
config.substitutions.append(('%{link_flags}', config.substitutions.append(('%{link_flags}',
'-nodefaultlibs {}/lib/libunwind.a -ldl -lc {}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags)) '-nodefaultlibs {}/libunwind.a -ldl -lc {}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
)) ))
config.substitutions.append(('%{exec}', config.substitutions.append(('%{exec}',
'{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@') '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')
)) ))
import os, site import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
libcxx.test.newconfig.configure( libcxx.test.newconfig.configure(
libcxx.test.params.DEFAULT_PARAMETERS, libcxx.test.params.DEFAULT_PARAMETERS,
libcxx.test.features.DEFAULT_FEATURES, libcxx.test.features.DEFAULT_FEATURES,
config, config,
lit_config lit_config
) )