[llvm-commits] [llvm] r120156 - in /llvm/trunk/test: Makefile lib/llvm.exp lit.cfg

[Duncan Sands]

Author: baldrick
Date: Thu Nov 25 15:19:52 2010
New Revision: 120156

URL: http://llvm.org/viewvc/llvm-project?rev=120156&view=rev
Log:
Use LLVMCC_EMITIR_FLAG rather than hard-coding "-emit-llvm".

Modified:
    llvm/trunk/test/Makefile
    llvm/trunk/test/lib/llvm.exp
    llvm/trunk/test/lit.cfg

Modified: llvm/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=120156&r1=120155&r2=120156&view=diff
==============================================================================
--- llvm/trunk/test/Makefile (original)
+++ llvm/trunk/test/Makefile Thu Nov 25 15:19:52 2010
@@ -162,6 +162,7 @@
 	@echo 'set grep "$(GREP)"' >>site.tmp
 	@echo 'set gas "$(GAS)"' >>site.tmp
 	@echo 'set llvmdsymutil "$(DSYMUTIL)"' >>site.tmp
+	@echo 'set emitir "$(LLVMCC_EMITIR_FLAG)"' >>site.tmp
 	@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
 	@test ! -f site.exp || \
 	sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp

Modified: llvm/trunk/test/lib/llvm.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=120156&r1=120155&r2=120156&view=diff
==============================================================================
--- llvm/trunk/test/lib/llvm.exp (original)
+++ llvm/trunk/test/lib/llvm.exp Thu Nov 25 15:19:52 2010
@@ -47,7 +47,7 @@
 # cases.
 proc substitute { line test tmpFile } {
   global srcroot objroot srcdir objdir subdir target_triplet
-  global llvmgcc llvmgxx ocamlopt
+  global llvmgcc llvmgxx emitir ocamlopt
   global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
   global llvmdsymutil valgrind grep gas bugpoint_topts
   set path [file join $srcdir $subdir]
@@ -60,9 +60,9 @@
   #replace %llvmgcc_only with actual path to llvmgcc
   regsub -all {%llvmgcc_only} $new_line "$llvmgcc" new_line
   #replace %llvmgcc with actual path to llvmgcc
-  regsub -all {%llvmgcc} $new_line "$llvmgcc -emit-llvm -w" new_line
+  regsub -all {%llvmgcc} $new_line "$llvmgcc $emitir -w" new_line
   #replace %llvmgxx with actual path to llvmg++
-  regsub -all {%llvmgxx} $new_line "$llvmgxx -emit-llvm -w" new_line
+  regsub -all {%llvmgxx} $new_line "$llvmgxx $emitir -w" new_line
   #replace %compile_cxx with C++ compilation command
   regsub -all {%compile_cxx} $new_line "$compile_cxx" new_line
   #replace %compile_c with C compilation command

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=120156&r1=120155&r2=120156&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Thu Nov 25 15:19:52 2010
@@ -125,12 +125,12 @@
 
 # Add substitutions.
 config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))
-for sub in ['llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c',
+for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c',
             'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
             'bugpoint_topts']:
     if sub in ('llvmgcc', 'llvmgxx'):
         config.substitutions.append(('%' + sub,
-                                     site_exp[sub] + ' -emit-llvm -w'))
+                                     site_exp[sub] + ' %emitir -w'))
     # FIXME: This is a hack to avoid LLVMC tests failing due to a clang driver
     #        warning when passing in "-fexceptions -fno-exceptions".
     elif sub == 'compile_cxx':