[llvm-commits] [llvm] r63548 - in /llvm/trunk/test: FrontendC++/2006-11-30-Pubnames.cpp Makefile lib/llvm.exp

[Devang Patel]

Author: dpatel
Date: Mon Feb  2 15:09:36 2009
New Revision: 63548

URL: http://llvm.org/viewvc/llvm-project?rev=63548&view=rev
Log:
Run dsymutil on darwin, when it is expected, before running gdb test.

Modified:
    llvm/trunk/test/FrontendC++/2006-11-30-Pubnames.cpp
    llvm/trunk/test/Makefile
    llvm/trunk/test/lib/llvm.exp

Modified: llvm/trunk/test/FrontendC++/2006-11-30-Pubnames.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-30-Pubnames.cpp?rev=63548&r1=63547&r2=63548&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC++/2006-11-30-Pubnames.cpp (original)
+++ llvm/trunk/test/FrontendC++/2006-11-30-Pubnames.cpp Mon Feb  2 15:09:36 2009
@@ -4,6 +4,7 @@
 // RUN:   llc --disable-fp-elim -o %t.s -f
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
+// RUN: %llvmdsymutil %t.exe 
 // RUN: echo {break main\nrun\np Pubnames::pubname} > %t.in
 // RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | grep {\$1 = 10}
 // XFAIL: alpha|ia64|arm

Modified: llvm/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=63548&r1=63547&r2=63548&view=diff

==============================================================================
--- llvm/trunk/test/Makefile (original)
+++ llvm/trunk/test/Makefile Mon Feb  2 15:09:36 2009
@@ -81,6 +81,13 @@
 clean::
 	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
 
+# dsymutil is used on the Darwin to manipulate DWARF debugging information.
+ifeq ($(OS),Darwin)
+DSYMUTIL=dsymutil
+else
+DSYMUTIL=true
+endif
+
 FORCE:
 
 site.exp: FORCE
@@ -112,6 +119,7 @@
 	@echo 'set valgrind "$(VALGRIND)"' >> site.tmp
 	@echo 'set grep "$(GREP)"' >>site.tmp
 	@echo 'set gas "$(GAS)"' >>site.tmp
+	@echo 'set llvmdsymutil "$(DSYMUTIL)"' >>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=63548&r1=63547&r2=63548&view=diff

==============================================================================
--- llvm/trunk/test/lib/llvm.exp (original)
+++ llvm/trunk/test/lib/llvm.exp Mon Feb  2 15:09:36 2009
@@ -48,7 +48,7 @@
 proc substitute { line test tmpFile } {
   global srcroot objroot srcdir objdir subdir target_triplet prcontext 
   global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
-  global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
+  global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir llvmdsymutil
   global valgrind grep gas
   set path [file join $srcdir $subdir]
 
@@ -73,6 +73,8 @@
   regsub -all {%shlibext} $new_line "$shlibext" new_line
   #replace %ocamlc with ocaml compiler command
   regsub -all {%ocamlc} $new_line "$ocamlc" new_line
+  #replace %llvmdsymutil with dsymutil command
+  regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line
   #replace %llvmlibsdir with configure library directory
   regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line
   #replace %p with path to source,