This is an archive of the discontinued LLVM Phabricator instance.

[zorg] Fix lit arg passing for libcxx-libcxxabi-singlethreaded-x86_64-linux-debian
ClosedPublic

Authored by jroelofs on Sep 9 2014, 9:40 AM.

Download Raw Diff

Details

Reviewers

danalbert
EricWF

Summary

The other way doesn't work... this one should.

Diff Detail

Event Timeline

jroelofs updated this revision to Diff 13479.Sep 9 2014, 9:40 AM

jroelofs retitled this revision from to [zorg] Fix lit arg passing for libcxx-libcxxabi-singlethreaded-x86_64-linux-debian.

jroelofs updated this object.

jroelofs edited the test plan for this revision. (Show Details)

jroelofs added reviewers: danalbert, EricWF.

jroelofs added a subscriber: Unknown Object (MLST).

danalbert added inline comments.Sep 9 2014, 4:41 PM

zorg/buildbot/builders/LibcxxAndAbiBuilder.py
89	I think is overrides the default LLVM_LIT_ARGS. Should add the defaults to the passed in list.

Sounds like the defaults get overridden anyway.

This revision is now accepted and ready to land.Sep 9 2014, 5:01 PM

Add the defaults explicitly.

LGTM.

Committed r217512.

Thanks!

Jon

Revision Contents

Path

Size

zorg/

buildbot/

builders/

LibcxxAndAbiBuilder.py

10 lines

Diff 13479

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

Context not available.
	haltOnFailure=True, workdir=src_root))	haltOnFailure=True, workdir=src_root))

	f.addStep(buildbot.steps.shell.ShellCommand(	f.addStep(buildbot.steps.shell.ShellCommand(
	name='cmake', command=['cmake', src_root], haltOnFailure=True,	name='cmake', command=['cmake', src_root,
	workdir=build_path, env=env))	'-DLLVM_LIT_ARGS='+litTestArgs],
		danalbertUnsubmitted Not Done Reply Inline Actions I think is overrides the default LLVM_LIT_ARGS. Should add the defaults to the passed in list. danalbert: I think is overrides the default LLVM_LIT_ARGS. Should add the defaults to the passed in list.
		haltOnFailure=True, workdir=build_path, env=env))

	# Build libcxxabi	# Build libcxxabi
	jobs_flag = properties.WithProperties('-j%(jobs)s')	jobs_flag = properties.WithProperties('-j%(jobs)s')
Context not available.
	haltOnFailure=True, workdir=build_path))	haltOnFailure=True, workdir=build_path))

	# Test libc++abi	# Test libc++abi
	lit_flags = properties.WithProperties("LIT_ARGS=%s" % litTestArgs)
	f.addStep(buildbot.steps.shell.ShellCommand(	f.addStep(buildbot.steps.shell.ShellCommand(
	name='test.libcxxabi', command=['make', lit_flags, 'check-libcxxabi'],	name='test.libcxxabi', command=['make', 'check-libcxxabi'],
	workdir=build_path))	workdir=build_path))

	# Test libc++	# Test libc++
	f.addStep(buildbot.steps.shell.ShellCommand(	f.addStep(buildbot.steps.shell.ShellCommand(
	name='test.libcxx', command=['make', lit_flags, 'check-libcxx'],	name='test.libcxx', command=['make', 'check-libcxx'],
	workdir=build_path))	workdir=build_path))

	return f	return f
Context not available.