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

[John Criswell]

Changes in directory llvm/test/QMTestDB/QMTest:

llvm.py updated: 1.5 -> 1.6

---
Log message:

Changed all references of as and dis to llvm-as and llvm-dis.
Modified the code to use utilities in the Release and Profile directories,
depending upon the current build type.



---
Diffs of the changes:

Index: llvm/test/QMTestDB/QMTest/llvm.py
diff -u llvm/test/QMTestDB/QMTest/llvm.py:1.5 llvm/test/QMTestDB/QMTest/llvm.py:1.6
--- llvm/test/QMTestDB/QMTest/llvm.py:1.5	Mon Sep 15 14:41:09 2003
+++ llvm/test/QMTestDB/QMTest/llvm.py	Mon Sep 15 17:14:20 2003
@@ -56,6 +56,7 @@
 		srcroot=context['srcroot']
 		buildroot=context['buildroot']
 		tmpdir=context['tmpdir']
+		buildtype=context['buildtype']
 
 		#
 		# Construct the pathname of the source file and object file.
@@ -66,7 +67,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		as  = buildroot + '/tools/Debug/llvm-as'
+		as  = buildroot + '/tools/' + buildtype + '/llvm-as'
 
 		#
 		# Assume we will succeed
@@ -141,7 +142,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		dis  = buildroot + '/tools/Debug/llvm-dis'
+		dis = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -215,8 +216,8 @@
 		# Construct the pathnames to the various utilities.
 		#
 		cc   = context['cc']
-		as   = buildroot + '/tools/' + context['buildtype'] + '/as'
-		dis  = buildroot + '/tools/' + context['buildtype'] + '/dis'
+		as   = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		dis  = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
 
 		#
 		# Construct the command to generate the C source and object
@@ -305,7 +306,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		llc  = buildroot + '/tools/Debug/llc'
+		llc  = buildroot + '/tools/' + context['buildtype'] + '/llc'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -376,7 +377,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		llc  = buildroot + '/tools/Debug/llc'
+		llc  = buildroot + '/tools/' + context['buildtype'] + '/llc'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -415,8 +416,8 @@
 	#
 	# LLVM Utilities
 	#
-	as='as'
-	dis='dis'
+	as='llvm-as'
+	dis='llvm-dis'
 	opt='opt'
 
 	#
@@ -445,9 +446,9 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		self.as  = buildroot + '/tools/Debug/as'
-		self.dis = buildroot + '/tools/Debug/dis'
-		self.opt = buildroot + '/tools/Debug/opt'
+		self.as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		self.dis = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
+		self.opt = buildroot + '/tools/' + context['buildtype'] + '/opt'
 
 		#
 		# Run the optimizer.
@@ -581,8 +582,8 @@
 		#
 		# Determine the path to the assembler and disassembler
 		#
-		as  = buildroot + '/tools/Debug/as'
-		dis = buildroot + '/tools/Debug/dis'
+		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		dis = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
 
 		#
 		# Find the name of the file to assemble.
@@ -684,7 +685,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		as  = buildroot + '/tools/Debug/as'
+		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -746,7 +747,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		lli  = buildroot + '/tools/Debug/lli -force-interpreter=false '
+		lli  = buildroot + '/tools/' + context['buildtype'] + '/lli -force-interpreter=false '
 
 		#
 		# Execute the program.
@@ -804,7 +805,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		anal  = buildroot + '/tools/Debug/analyze -tddatastructure'
+		anal  = buildroot + '/tools/' + context['buildtype'] + '/analyze -tddatastructure'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -977,7 +978,7 @@
 		# Construct the pathnames to the various utilities.
 		#
 		cc   = context['llvmgcc']
-		as   = buildroot + '/tools/' + context['buildtype'] + '/as'
+		as   = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
 
 		#
 		# Construct the command to generate the LLVM assembly and byte
@@ -1154,7 +1155,7 @@
 		#
 		# Find the pathname of the assembler.
 		#
-		as = self.buildroot + '/tools/Debug/as'
+		as = self.buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
 
 		#
 		# Use the LLVM assembler to create the bytecode file.