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

[Reid Spencer]

Changes in directory llvm/test/QMTest:

llvm.py updated: 1.31 -> 1.32
---
Log message:

Alter path locations for PR456: http://llvm.cs.uiuc.edu/PR456 .


---
Diffs of the changes:  (+20 -20)

Index: llvm/test/QMTest/llvm.py
diff -u llvm/test/QMTest/llvm.py:1.31 llvm/test/QMTest/llvm.py:1.32
--- llvm/test/QMTest/llvm.py:1.31	Mon Aug  2 17:29:41 2004
+++ llvm/test/QMTest/llvm.py	Thu Nov 18 11:18:57 2004
@@ -147,7 +147,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		as  = buildroot + '/tools/' + buildtype + '/llvm-as'
+		as  = buildroot + '/' + buildtype + '/bin/llvm-as'
 
 		#
 		# Assume we will succeed
@@ -222,9 +222,9 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		dis = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
-		llc = buildroot + '/tools/' + context['buildtype'] + '/llc'
+		as  = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
+		dis = buildroot + '/' + context['buildtype'] + '/bin/llvm-dis'
+		llc = buildroot + '/' + context['buildtype'] + '/bin/llc'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -304,8 +304,8 @@
 		# Construct the pathnames to the various utilities.
 		#
 		cc   = context['cc']
-		as   = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		dis  = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
+		as   = buildroot + '/' + context['buildtype'] +'/bin/llvm-as'
+		dis  = buildroot + '/' + context['buildtype'] +'/bin/llvm-dis'
 
 		#
 		# Construct the command to generate the C source and object
@@ -391,8 +391,8 @@
 		asmfile=bcfile + '.s'
 
 		# Construct the pathnames to the various utilities.
-		as   = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		llc  = buildroot + '/tools/' + context['buildtype'] + '/llc'
+		as   = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
+		llc  = buildroot + '/' + context['buildtype'] + '/bin/llc'
 
 		# Assemble the bytecode file.
 		if (ExecProgram ((as, srcfile, '-f', '-o', bcfile))):
@@ -473,9 +473,9 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		self.as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		self.dis = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
-		self.opt = buildroot + '/tools/' + context['buildtype'] + '/opt'
+		self.as  = buildroot + '/' +context['buildtype']+'/bin/llvm-as'
+		self.dis = buildroot + '/' +context['buildtype']+'/bin/llvm-dis'
+		self.opt = buildroot + '/' +context['buildtype']+'/bin/opt'
 
 		#
 		# Run the optimizer.
@@ -600,8 +600,8 @@
 		#
 		# Determine the path to the assembler and disassembler
 		#
-		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		dis = buildroot + '/tools/' + context['buildtype'] + '/llvm-dis'
+		as  = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
+		dis = buildroot + '/' + context['buildtype'] + '/bin/llvm-dis'
 
 		#
 		# Find the name of the file to assemble.
@@ -712,7 +712,7 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		as  = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
 
 		#
 		# Use the LLVM assembler to assemble the program.
@@ -776,8 +776,8 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		as  = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
-		lli = buildroot + '/tools/' + context['buildtype'] + '/lli'
+		as  = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
+		lli = buildroot + '/' + context['buildtype'] + '/bin/lli'
 
 		#
 		# Assemble the program.
@@ -866,7 +866,7 @@
 		# Construct a new path that includes the LLVM tools.
 		environment = os.environ
 		oldpath = environment['PATH']
-		environment['PATH'] = buildroot + '/tools/' + buildtype + ':' + srcroot + '/test/Scripts:' + environment['PATH']
+		environment['PATH'] = buildroot + '/' + buildtype + '/bin:' + srcroot + '/test/Scripts:' + environment['PATH']
 		environment['QMV_llvmgcc'] = context['llvmgcc']
 
 		# Extract the RUN: script (making the following substitutions:)
@@ -947,7 +947,7 @@
 		# Construct the pathnames to the various utilities.
 		#
 		cc   = context['llvmgcc']
-		as   = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		as   = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
 
 		#
 		# Construct the command to generate the LLVM assembly and byte
@@ -1035,7 +1035,7 @@
 		# Construct the pathnames to the various utilities.
 		#
 		cc   = context['llvmgxx']
-		as   = buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		as   = buildroot + '/' + context['buildtype'] + '/bin/llvm-as'
 
 		#
 		# Construct the command to generate the LLVM assembly and byte
@@ -1214,7 +1214,7 @@
 		#
 		# Find the pathname of the assembler.
 		#
-		as = self.buildroot + '/tools/' + context['buildtype'] + '/llvm-as'
+		as = self.buildroot + '/' + context['buildtype'] +'/bin/llvm-as'
 
 		#
 		# Use the LLVM assembler to create the bytecode file.