Remove prcontext.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81427 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-09-10 04:56:59 +00:00
parent fabcb9127f
commit f3e2d80770
5 changed files with 2 additions and 49 deletions

View File

@ -650,14 +650,6 @@ substitutions</a></div>
<dd>The target triplet that corresponds to the current host machine (the one <dd>The target triplet that corresponds to the current host machine (the one
running the test cases). This should probably be called "host".<dd> running the test cases). This should probably be called "host".<dd>
<dt><b>prcontext</b> (%prcontext)</dt>
<dd>Path to the prcontext tcl script that prints some context around a
line that matches a pattern. This isn't strictly necessary as the test suite
is run with its PATH altered to include the test/Scripts directory where
the prcontext script is located. Note that this script is similar to
<tt>grep -C</tt> but you should use the <tt>prcontext</tt> script because
not all platforms support <tt>grep -C</tt>.</dd>
<dt><b>llvmgcc</b> (%llvmgcc)</dt> <dt><b>llvmgcc</b> (%llvmgcc)</dt>
<dd>The full path to the <tt>llvm-gcc</tt> executable as specified in the <dd>The full path to the <tt>llvm-gcc</tt> executable as specified in the
configured LLVM environment</dd> configured LLVM environment</dd>

View File

@ -133,7 +133,6 @@ site.exp: FORCE
@echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp @echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp
@echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp
@echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp @echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
@echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
@echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
@echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
@echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp

View File

@ -1,36 +0,0 @@
#!/usr/bin/tclsh
#
# Usage:
# prcontext <pattern> <# lines of context>
# (for platforms that don't have grep -C)
#
# Get the arguments
#
set pattern [lindex $argv 0]
set num [lindex $argv 1]
#
# Get all of the lines in the file.
#
set lines [split [read stdin] \n]
set index 0
foreach line $lines {
if { [regexp $pattern $line match matchline] } {
if { [ expr [expr $index - $num] < 0 ] } {
set bottom 0
} else {
set bottom [expr $index - $num]
}
set endLineNum [ expr [expr $index + $num] + 1]
while {$bottom < $endLineNum} {
set output [lindex $lines $bottom]
puts $output
set bottom [expr $bottom + 1]
}
}
set index [expr $index + 1]
}

View File

@ -46,7 +46,7 @@ proc execOneLine { test PRS outcome lineno line } {
# This procedure performs variable substitutions on the RUN: lines of a test # This procedure performs variable substitutions on the RUN: lines of a test
# cases. # cases.
proc substitute { line test tmpFile } { proc substitute { line test tmpFile } {
global srcroot objroot srcdir objdir subdir target_triplet prcontext global srcroot objroot srcdir objdir subdir target_triplet
global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlopt global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlopt
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
global llvmdsymutil valgrind grep gas bugpoint_topts global llvmdsymutil valgrind grep gas bugpoint_topts
@ -57,8 +57,6 @@ proc substitute { line test tmpFile } {
#replace %% with _#MARKER#_ to make the replacement of %% more predictable #replace %% with _#MARKER#_ to make the replacement of %% more predictable
regsub -all {%%} $new_line {_#MARKER#_} new_line regsub -all {%%} $new_line {_#MARKER#_} new_line
#replace %prcontext with prcontext.tcl (Must replace before %p)
regsub -all {%prcontext} $new_line $prcontext new_line
#replace %llvmgcc_only with actual path to llvmgcc #replace %llvmgcc_only with actual path to llvmgcc
regsub -all {%llvmgcc_only} $new_line "$llvmgcc" new_line regsub -all {%llvmgcc_only} $new_line "$llvmgcc" new_line
#replace %llvmgcc with actual path to llvmgcc #replace %llvmgcc with actual path to llvmgcc

View File

@ -76,7 +76,7 @@ for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):
site_exp[m.group(1)] = m.group(2) site_exp[m.group(1)] = m.group(2)
# Add substitutions. # Add substitutions.
for sub in ['prcontext', 'llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c', for sub in ['llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c',
'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir', 'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
'bugpoint_topts']: 'bugpoint_topts']:
if sub in ('llvmgcc', 'llvmgxx'): if sub in ('llvmgcc', 'llvmgxx'):