[llvm-commits] CVS: llvm/test/QMTest/llvm.py

[John Criswell]

Changes in directory llvm/test/QMTest:

llvm.py updated: 1.24 -> 1.25

---
Log message:

Improved some of the test failure reporting.



---
Diffs of the changes:  (+11 -6)

Index: llvm/test/QMTest/llvm.py
diff -u llvm/test/QMTest/llvm.py:1.24 llvm/test/QMTest/llvm.py:1.25
--- llvm/test/QMTest/llvm.py:1.24	Thu Nov 20 19:13:36 2003
+++ llvm/test/QMTest/llvm.py	Tue Nov 25 16:05:45 2003
@@ -619,32 +619,36 @@
 		# Assemble the file.
 		#
 		if (ExecProgram ((as, input, '-f', '-o', bc1))):
-			result.Fail ()
+			result.Fail ('Failed to assemble ' + input)
+			return
 
 		#
 		# Disassemble the output.
 		#
 		if (ExecProgram ((dis, bc1, '-f', '-o', ll1))):
-			result.Fail()
+			result.Fail('Failed to disassemble ' + bc1)
+			return
 
 		#
 		# Assemble the program again.
 		#
 		if (ExecProgram ((as, ll1, '-f', '-o', bc2))):
-			result.Fail()
+			result.Fail('Failed to assemble ' + ll1)
+			return
 
 		#
 		# Disassemble the program one last time.
 		#
 		if (ExecProgram ((dis, bc2, '-f', '-o', ll2))):
-			result.Fail()
+			result.Fail('Failed to disassemble ' + bc2)
+			return
 
 		#
 		# Compare the LLVM assembly output to see if it is the same.
 		#
 		exit_status = filecmp.cmp (ll1, ll2, 'false')
 		if exit_status == 0:
-			result.Fail()
+			result.Fail(ll1 + ' and ' + ll2 + ' differ')
 			return
 
 		#
@@ -772,13 +776,14 @@
 		# Construct the pathnames to the various utilities.
 		#
 		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		lli = buildroot + '/tools/' + context['buildtype'] + '/lli -force-interpreter=false '
+		lli = buildroot + '/tools/' + context['buildtype'] + '/lli'
 
 		#
 		# Assemble the program.
 		#
 		if (ExecProgram ((as, '-f', '-o', bcfile, srcfile))):
 			result.Fail('Failed to assemble LLVM code')
+			return
 
 		#
 		# Execute the program.