This is an archive of the discontinued LLVM Phabricator instance.

Differential D112649

[libunwind] Simplify the executor used in the tests
ClosedPublic

Authored by ldionne on Oct 27 2021, 12:06 PM.

Details

Reviewers
steven_wu
Group Reviewers
Restricted Project
Commits
rG3e39bbf5f961: [libunwind] Simplify the executor used in the tests
Summary

Instead of going through libc++'s run.py, we can simply run the executable
directly since we don't need to setup a working directory or control the
environment.

Diff Detail

Event Timeline

ldionne created this revision.Oct 27 2021, 12:06 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 27 2021, 12:06 PM
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 27 2021, 12:06 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 27 2021, 12:06 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
steven_wu accepted this revision.Oct 27 2021, 12:46 PM
This revision is now accepted and ready to land.Oct 27 2021, 12:46 PM
Harbormaster completed remote builds in B131009: Diff 382748.Oct 27 2021, 1:18 PM
Closed by commit rG3e39bbf5f961: [libunwind] Simplify the executor used in the tests (authored by ldionne). · Explain WhyOct 27 2021, 2:30 PM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG3e39bbf5f961: [libunwind] Simplify the executor used in the tests.

Revision Contents

PathSize
libunwind/
test/
configs/
4 lines
4 lines

Diff 382748

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

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Linesconfig.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} -Wl,-rpath,{0} -lunwind -ldl -lc {1}'.format('@LIBUNWIND_LIBRARY_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@')
))
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 45 Lines • ▼ Show 20 Linesconfig.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 {}/libunwind.a -ldl -lc {}'.format('@LIBUNWIND_LIBRARY_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@')
))
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
) )