Remove building llvm2ice.build_atts from Subzero build.

tests_lit/lit.cfg

 # -*- Python -*-
 # Taken from utils/lit/tests in the LLVM tree and hacked together to support
 # our tests.
 #
 # Note: This configuration has simple commands to run Subzero's translator.
 # They have the form %X2i (i.e. %p2i, %l2i, and %lc2i) where X is defined
 # as follows:
 #
 #   p : Run Subzero's translator, building ICE from PNaCl bitcode directly.
 #   l : Run Subzero's translator, converting the .ll file to a PNaCl bitcode
@@ skipping 21 matching lines @@
 # existence of %l2i and %lc2i), you can use the %if command (which is
 # a short hand for using pydir/ifatts.py).
 
 import os
 import re
 import sys
 
 import lit.formats
 
 sys.path.insert(0, 'pydir')
-from utils import FindBaseNaCl
+from utils import FindBaseNaCl, shellcmd
 from ifatts import GetFileAttributes
 
 # name: The name of this test suite.
 config.name = 'subzero'
 
 # testFormat: The test format to use to interpret tests.
 config.test_format = lit.formats.ShTest()
 
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes = ['.ll']
 
 # test_source_root: The root path where tests are located.
 config.test_source_root = os.path.dirname(__file__)
 config.test_exec_root = config.test_source_root
 config.target_triple = '(unused)'
 
 src_root = os.path.join(FindBaseNaCl(), 'toolchain_build/src/subzero')
 bin_root = src_root
 config.substitutions.append(('%{src_root}', src_root))
 config.substitutions.append(('%{python}', sys.executable))
 
 pydir = os.path.join(bin_root, 'pydir')
 
 # Finding LLVM binary tools. All tools used in the tests must be listed in
 # the llvmbintools list.
 llvmbinpath = os.path.abspath(os.environ.get('LLVM_BIN_PATH'))
 
 # Define the location of the llvm2ice tool.
 llvm2icetool = os.path.join(bin_root, 'llvm2ice')
-llvm2icetoolatts = os.path.join(bin_root, 'llvm2ice.build_atts')
+llvm2iceatts = shellcmd(' '.join([llvm2icetool, '--build-atts']),
+                        echo=False).split()
 
 # Add build attributes of llvm2ice tool to the set of available features.
-config.available_features.update(GetFileAttributes(llvm2icetoolatts))
+config.available_features.update(llvm2iceatts)
 
-# Base command for testing build attributes
-if_atts_base = [os.path.join(pydir, 'ifatts.py'), llvm2icetoolatts]
-if_atts_cmd = if_atts_base + ['--command']
-ifl2i_atts_cmd = if_atts_base + ['--att=allow_llvm_ir', '--command']
-iflc2i_atts_cmd = if_atts_base + ['--att=allow_llvm_ir',
-                                  '--att=allow_llvm_ir_as_input',
-                                  '--command']
+def if_cond_flag(Value):
+  return '--cond=true' if Value else '--cond=false'
+
+# shell conditional commands.
+if_atts = [os.path.join(pydir, 'if.py')]
+if_atts_cmd = if_atts + ['--have=' + att
+                         for att in llvm2iceatts] + ['--command']
+ifl2i_atts_cmd = if_atts + [if_cond_flag('allow_llvm_ir' in llvm2iceatts),
+                            '--command']
+iflc2i_atts_cmd = if_atts + [if_cond_flag('allow_llvm_ir_as_input'
+                                          in llvm2iceatts), '--command']
 
 # Base command for running llvm2ice
 llvm2ice_cmd = [os.path.join(pydir, 'run-llvm2ice.py'),
                 '--llvm2ice', llvm2icetool,
                 '--llvm-bin-path', llvmbinpath]
 
 # Run commands only if corresponding build attributes apply, including
 # for each compiler setup.
 config.substitutions.append(('%ifp', ' '))
 config.substitutions.append(('%iflc', ' '.join(iflc2i_atts_cmd)))
@@ skipping 28 matching lines @@
 # Add a feature to detect the Python version.
 config.available_features.add("python%d.%d" % (sys.version_info[0],
                                                sys.version_info[1]))
 
 # Debugging output
 def dbg(s):
   print '[DBG] %s' % s
 
 dbg('bin_root = %s' % bin_root)
 dbg('llvmbinpath = %s' % llvmbinpath)
+dbg("Build attributes = %s" % llvm2iceatts)