Now using path to python found by configure.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17610 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index 31de463b3e2d53d6e86945a013b07b281de0af71..4ab3df8c6a8552f17756c90c95a3fe4f0f7afc4a 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -136,7 +136,7 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo '# Do not edit here.  If you wish to override these values' >>site.tmp
        @echo '# edit the last section' >>site.tmp
        @echo "set target_triplet $(TARGET_TRIPLE)" >> site.tmp
-       @echo 'set prcontext $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py' >> site.tmp
+       @echo 'set prcontext "$(PYTHON) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py"' >> site.tmp
        @echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
        @echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp
        @echo 'set llvmgcc $(LLVMGCCDIR)/bin/gcc' >> site.tmp

diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 7fcb1facdb823d46f03ed8c5fd2b1af18890dca0..35f9d3bf295a3d89a10a5e8c731300c6207f1dad 100644 (file)
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -53,7 +53,7 @@ proc llvm-runtest { programs objdir subdir target_triplet llvmgcc llvmgxx prcont
                regsub -all {%llvmgxx} $new_runline $llvmgxx new_runline
                
                #replace %prcontext with actual path to llvmg++ (Goes away when we remove qmtest)
-               regsub -all {%prcontext} $new_runline "python $prcontext" new_runline
+               regsub -all {%prcontext} $new_runline "$prcontext" new_runline
 
                puts $scriptFileId $new_runline
            } elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {