This is an archive of the discontinued LLVM Phabricator instance.

Differential D76092

Allow site-specific test_exec_root.
ClosedPublic

Authored by danalbert on Mar 12 2020, 12:18 PM.

Details

Reviewers
EricWF
mclow.lists
ldionne
Group Reviewers
Restricted Project
Commits
rG14d2d8c9761b: Allow site-specific test_exec_root.

Diff Detail

Event Timeline

danalbert created this revision.Mar 12 2020, 12:18 PM
Herald added a reviewer: mclow.lists. · View Herald TranscriptMar 12 2020, 12:18 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B49036: Diff 250017.Mar 12 2020, 1:01 PM
ldionne added a subscriber: ldionne.Mar 12 2020, 4:09 PM
ldionne added inline comments.
libcxx/test/lit.cfg
41–42

I haven't come across the test_exec_root yet, what is it used for? I grepped but couldn't find out.

danalbert marked 2 inline comments as done.Mar 12 2020, 5:30 PM
danalbert added inline comments.
libcxx/test/lit.cfg
41–42

The cwd for compilation is one use. Not sure if there are others. We override this in Android because our obj root (libc++ install location) and the test location is not the same.

danalbert marked an inline comment as done.Mar 12 2020, 5:34 PM
ldionne accepted this revision.Mar 13 2020, 10:28 AM
ldionne added inline comments.
libcxx/test/lit.cfg
41–42

Do you have a publicly visible tester that uses this? I'm asking because I'd like to improve the CMake/lit interaction in the coming weeks, and I want to be able to see when I break you.

This revision is now accepted and ready to land.Mar 13 2020, 10:28 AM
Herald added a subscriber: dexonsmith. · View Herald TranscriptMar 13 2020, 10:28 AM
Closed by commit rG14d2d8c9761b: Allow site-specific test_exec_root. (authored by danalbert). · Explain WhyMar 13 2020, 12:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
test/
3 lines

Diff 250278

libcxx/test/lit.cfg

Show All 32 Lines
if obj_root is None: if obj_root is None:
obj_root = getattr(config, 'libcxx_obj_root', None) obj_root = getattr(config, 'libcxx_obj_root', None)
if obj_root is None: if obj_root is None:
import tempfile import tempfile
obj_root = tempfile.mkdtemp(prefix='libcxx-testsuite-') obj_root = tempfile.mkdtemp(prefix='libcxx-testsuite-')
lit_config.warning('Creating temporary directory for object root: %s' % lit_config.warning('Creating temporary directory for object root: %s' %
obj_root) obj_root)
if not config.test_exec_root:
config.test_exec_root = os.path.join(obj_root, 'test') config.test_exec_root = os.path.join(obj_root, 'test')
ldionneUnsubmitted
Done
ReplyInline Actions

I haven't come across the test_exec_root yet, what is it used for? I grepped but couldn't find out.

ldionne: I haven't come across the `test_exec_root` yet, what is it used for? I grepped but couldn't…
danalbertAuthorUnsubmitted
Done
ReplyInline Actions

The cwd for compilation is one use. Not sure if there are others. We override this in Android because our obj root (libc++ install location) and the test location is not the same.

danalbert: The cwd for compilation is one use. Not sure if there are others. We override this in Android…
ldionneUnsubmitted
Not Done
ReplyInline Actions

Do you have a publicly visible tester that uses this? I'm asking because I'd like to improve the CMake/lit interaction in the coming weeks, and I want to be able to see when I break you.

ldionne: Do you have a publicly visible tester that uses this? I'm asking because I'd like to improve…
cfg_variant = getattr(config, 'configuration_variant', 'libcxx') cfg_variant = getattr(config, 'configuration_variant', 'libcxx')
if cfg_variant: if cfg_variant:
lit_config.note('Using configuration variant: %s' % cfg_variant) lit_config.note('Using configuration variant: %s' % cfg_variant)
# Load the Configuration class from the module name <cfg_variant>.test.config. # Load the Configuration class from the module name <cfg_variant>.test.config.
config_module_name = '.'.join([cfg_variant, 'test', 'config']) config_module_name = '.'.join([cfg_variant, 'test', 'config'])
config_module = __import__(config_module_name, fromlist=['Configuration']) config_module = __import__(config_module_name, fromlist=['Configuration'])
configuration = config_module.Configuration(lit_config, config) configuration = config_module.Configuration(lit_config, config)
configuration.configure() configuration.configure()
configuration.print_config_info() configuration.print_config_info()
config.test_format = configuration.get_test_format() config.test_format = configuration.get_test_format()