Clean up run script to use for testing Subzero.

tests_lit/lit.cfg

Index: tests_lit/lit.cfg
diff --git a/tests_lit/lit.cfg b/tests_lit/lit.cfg
index f1d3c7410d5b4ff595624dc59a98e25a77d3826a..825f7d2b3051d4bc366080b71cdbb696fc540b91 100644
--- a/tests_lit/lit.cfg
+++ b/tests_lit/lit.cfg
@@ -39,11 +39,33 @@ llvmbinpath = os.path.abspath(os.environ.get('LLVM_BIN_PATH'))
 
 # Finding Subzero tools
 llvm2icetool = os.path.join(bin_root, 'llvm2ice')
+
+# Convert LLVM source to PNaCl bitcode, read using the
+# Subzero bitcode reader, and then translate.
+config.substitutions.append(
+  ('%p2i', ' '.join([os.path.join(pydir, 'run-llvm2ice.py'),
+                     '--llvm2ice', llvm2icetool,
+                     '--llvm-bin-path', llvmbinpath
+                    ])))
+
+# Convert LLVM source to PNaCl bitcode, read using the PNaCl bitcode reader,
+# convert to ICE using the ICE Converter, and then translate.
+# TODO(kschimpf) Deprecated, remove once p2i working.
 config.substitutions.append(
-  ('%llvm2iceinsts', ' '.join([os.path.join(pydir, 'llvm2iceinsts.py'),
-                               '--llvm2ice', llvm2icetool,
-                               '--llvm-bin-path', llvmbinpath
-                             ])))
+  ('%l2i', ' '.join([os.path.join(pydir, 'run-llvm2ice.py'),
+                     '--llvm', '--llvm2ice', llvm2icetool,
+                     '--llvm-bin-path', llvmbinpath
+                    ])))
+
+# Read LLVM source, convert to ICE using the ICE converter, and then translate.
+# Note: l2i is preferred over lc2i, since it uses PNaCl bitcode.
+# TODO(kschimpf) Deprecated, remove once p2i working.
+config.substitutions.append(
+  ('%lc2i', ' '.join([os.path.join(pydir, 'run-llvm2ice.py'),
+                      '--llvm-source', '--llvm2ice', llvm2icetool,
+                      '--llvm-bin-path', llvmbinpath
+                    ])))
+
 config.substitutions.append(('%llvm2ice', llvm2icetool))
 config.substitutions.append(('%szdiff', os.path.join(pydir, 'szdiff.py')))