tests_lit/lit.cfg - Issue 914263005: Subzero: switch from llvm-objdump to objdump for lit tests (for LLVM merge)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests_lit/lit.cfg

Issue 914263005: Subzero: switch from llvm-objdump to objdump for lit tests (for LLVM merge) (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tests_lit/assembler/x86/opcode_register_encodings.ll ('k') | tests_lit/llvm2ice_tests/64bit.pnacl.ll » ('j') | tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tests_lit/lit.cfg

diff --git a/tests_lit/lit.cfg b/tests_lit/lit.cfg

index b8bde4e6891d5d17cd261d2b2387f2b0db38445e..14b603b33282f667c0321e53378e74ff8ed09cd6 100644

--- a/tests_lit/lit.cfg

+++ b/tests_lit/lit.cfg

@@ -66,6 +66,9 @@ pydir = os.path.join(bin_root, 'pydir')

# the llvmbintools list.

llvmbinpath = os.path.abspath(os.environ.get('LLVM_BIN_PATH'))

+# Find binutils tools. This is used for objdump.

+binutilsbinpath = os.path.abspath(os.environ.get('BINUTILS_BIN_PATH'))

# Define the location of the llvm2ice tool.

llvm2icetool = os.path.join(bin_root, 'llvm2ice')

llvm2iceatts = shellcmd(' '.join([llvm2icetool, '--build-atts']),

@@ -88,7 +91,8 @@ iflc2i_atts_cmd = if_atts + [if_cond_flag('allow_llvm_ir_as_input'

# Base command for running llvm2ice

llvm2ice_cmd = [os.path.join(pydir, 'run-llvm2ice.py'),

'--llvm2ice', llvm2icetool,

- '--llvm-bin-path', llvmbinpath]

+ '--llvm-bin-path', llvmbinpath,

+ '--binutils-bin-path', binutilsbinpath]

# Run commands only if corresponding build attributes apply, including

# for each compiler setup.

@@ -136,4 +140,5 @@ def dbg(s):

dbg('bin_root = %s' % bin_root)

dbg('llvmbinpath = %s' % llvmbinpath)

+dbg('binutilsbinpath = %s' % binutilsbinpath)

dbg("Build attributes = %s" % llvm2iceatts)