[llvm-commits] [hlvm] r38180 - in /hlvm/trunk: build/check.py build/configure.py build/hlvm.py test/lib/return0.exp
Reid Spencer
reid at x10sys.com
Sat Jul 7 17:00:51 PDT 2007
Author: reid
Date: Sat Jul 7 19:00:51 2007
New Revision: 38180
URL: http://llvm.org/viewvc/llvm-project?rev=38180&view=rev
Log:
Excise Reid's personal paths from the test environment and make use of
configured values instead.
Modified:
hlvm/trunk/build/check.py
hlvm/trunk/build/configure.py
hlvm/trunk/build/hlvm.py
hlvm/trunk/test/lib/return0.exp
Modified: hlvm/trunk/build/check.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/check.py?rev=38180&r1=38179&r2=38180&view=diff
==============================================================================
--- hlvm/trunk/build/check.py (original)
+++ hlvm/trunk/build/check.py Sat Jul 7 19:00:51 2007
@@ -28,7 +28,21 @@
outf.write('set tmpdir "$objdir/tmp"\n')
outf.write('set srcrootdir "' + env['AbsSrcRoot'] + '"\n')
outf.write('set objrootdir "' + env['AbsObjRoot'] + '"\n')
- outf.write('set llcpath "' + env['with_llc'] + '"\n')
+ outf.write('set LLVM_lib "' + env['LLVM_lib'] + '"\n')
+ outf.write('set LLVM_inc "' + env['LLVM_inc'] + '"\n')
+ outf.write('set LLVM_bin "' + env['LLVM_bin'] + '"\n')
+ outf.write('set LIBXML2_lib "' + env['LIBXML2_lib'] + '"\n')
+ outf.write('set LIBXML2_inc "' + env['LIBXML2_inc'] + '"\n')
+ outf.write('set LIBXML2_bin "' + env['LIBXML2_bin'] + '"\n')
+ outf.write('set APR_lib "' + env['APR_lib'] + '"\n')
+ outf.write('set APR_inc "' + env['APR_inc'] + '"\n')
+ outf.write('set APR_bin "' + env['APR_bin'] + '"\n')
+ outf.write('set APRU_lib "' + env['APRU_lib'] + '"\n')
+ outf.write('set APRU_inc "' + env['APRU_inc'] + '"\n')
+ outf.write('set APRU_bin "' + env['APRU_bin'] + '"\n')
+ outf.write('set llc "' + env['with_llc'] + '"\n')
+ outf.write('set gccld "' + env['with_gccld'] + '"\n')
+ outf.write('set gxx "' + env['with_gxx'] + '"\n')
outf.write('## All vars above are generated by scons. Do Not Edit!\n')
outf.close()
return 0
Modified: hlvm/trunk/build/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/configure.py?rev=38180&r1=38179&r2=38180&view=diff
==============================================================================
--- hlvm/trunk/build/configure.py (original)
+++ hlvm/trunk/build/configure.py Sat Jul 7 19:00:51 2007
@@ -80,9 +80,9 @@
# Check each path
for p in paths:
# Clear old settings from previous iterations
- libdir = None
- incdir = None
- bindir = None
+ libdir = ''
+ incdir = ''
+ bindir = ''
objects = []
foundlib = 0
# Check various library directory names
@@ -269,10 +269,12 @@
return 1
def CheckForPrograms(conf,env):
- if not conf.CheckProgram('gperf','with_gperf'):
+ if not conf.CheckProgram('g++','with_gxx'):
_failed(env)
if not conf.CheckProgram('llc','with_llc'):
_failed(env)
+ if not conf.CheckProgram('gccld','with_gccld'):
+ _failed(env)
if not conf.CheckProgram('llvm-dis','with_llvmdis',[env['LLVM_bin']]):
_failed(env)
if not conf.CheckProgram('llvm-as','with_llvmas',[env['LLVM_bin']]):
@@ -285,6 +287,8 @@
_failed(env)
if not conf.CheckProgram('llvm-ar','with_llvmar',[env['LLVM_bin']]):
_failed(env)
+ if not conf.CheckProgram('gperf','with_gperf'):
+ _failed(env)
if not conf.CheckProgram('runtest','with_runtest'):
env['with_runtest'] = None
print "*** TESTING DISABLED ***"
Modified: hlvm/trunk/build/hlvm.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/hlvm.py?rev=38180&r1=38179&r2=38180&view=diff
==============================================================================
--- hlvm/trunk/build/hlvm.py (original)
+++ hlvm/trunk/build/hlvm.py Sat Jul 7 19:00:51 2007
@@ -104,10 +104,12 @@
opts.Add('with_apr','Specify where apr is located','/usr/local/apr')
opts.Add('with_apru','Specify where apr-utils is located','/usr/local/apr')
opts.Add('with_xml2','Specify where LibXml2 is located','/usr/local')
- opts.Add('with_gperf','Specify where the gperf program is located',
- '/usr/local/bin/gperf')
+ opts.Add('with_gxx','Specify where the GCC C++ compiler is located',
+ '/usr/local/bin/g++')
opts.Add('with_llc','Specify where the LLVM compiler is located',
'/usr/local/bin/llc')
+ opts.Add('with_gccld','Specify where the LLVM GCC Linker is located',
+ '/usr/local/bin/gccld')
opts.Add('with_llvmdis','Specify where the LLVM disassembler is located',
'/usr/local/bin/llvm-dis')
opts.Add('with_llvmas','Specify where the LLVM assembler is located',
@@ -120,6 +122,8 @@
'/usr/local/bin/llvm-g++')
opts.Add('with_llvm2cpp','Specify where the LLVM llvm2cpp program is located',
'/usr/local/bin/llvm2cpp')
+ opts.Add('with_gperf','Specify where the gperf program is located',
+ '/usr/local/bin/gperf')
opts.Add('with_runtest','Specify where DejaGnu runtest program is located',
'/usr/local/bin/runtest')
opts.Add('with_doxygen','Specify where the doxygen program is located',
Modified: hlvm/trunk/test/lib/return0.exp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/lib/return0.exp?rev=38180&r1=38179&r2=38180&view=diff
==============================================================================
--- hlvm/trunk/test/lib/return0.exp (original)
+++ hlvm/trunk/test/lib/return0.exp Sat Jul 7 19:00:51 2007
@@ -21,17 +21,13 @@
#
#===------------------------------------------------------------------------===#
proc hlvm-ret-zero-test { pat } {
- global srcdir subdir objdir tmpdir objrootdir llcpath
+ global srcdir subdir objdir tmpdir objrootdir llc gccld gxx APR_lib
set outdir [file join $objdir $subdir]
set compiler [file join $objrootdir tools hlvm-compiler hlvm-compiler ]
- set llc /proj/llvm/build/Debug/bin/llc
- set gccld /proj/llvm/build/Debug/bin/gccld
- set gxx /proj/llvm/cfe/install/bin/llvm-g++
set source [file join $srcdir $subdir ]
set rtlib [file join $objrootdir hlvm Runtime HLVMRuntime.bca ]
set baselib [file join $objrootdir hlvm Base HLVMBase.bca ]
set vmmain [file join $objrootdir tools hlvm hlvm.bc ]
- set cfelib [file join / proj llvm cfe install lib ]
set files [lsort [
glob -nocomplain -tails -types {f r} -directory $source $pat]]
set dirs [lsort [
@@ -57,13 +53,12 @@
set testlinked [file join $outdir ${test}.linked ]
set testlinkedbc [file join $outdir ${test}.linked.bc ]
set tests [file join $outdir ${test}.s ]
- set cfestdcpp [file join $cfelib libstdc++.a ]
set execout ""
set retval [ catch { exec $compiler $testsrc -llvmbc -o $testbc } msg ]
if { $retval != 0 } {
fail "$test: hlvm-compiler returned $retval:\n$msg"
} else {
- set retval [ catch { exec gccld -o $testlinked $testbc $vmmain $rtlib } msg ]
+ set retval [ catch { exec $gccld -o $testlinked $testbc $vmmain $rtlib } msg ]
if { $retval != 0 } {
fail "$test: gccld returned $retval:\n$msg"
} else {
@@ -71,7 +66,7 @@
if { $retval != 0 } {
fail "$test: llc returned $retval:\n$msg"
} else {
- set retval [ catch { exec $gxx -g -o $testexe $tests -L/proj/install/lib -lapr-1 -laprutil-1 } msg ]
+ set retval [ catch { exec $gxx -g -o $testexe $tests -L $APR_lib -lapr-1 -laprutil-1 } msg ]
if { $retval != 0 } {
fail "$test: gxx returned $retval:\n$msg"
} else {
More information about the llvm-commits
mailing list