6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-02 04:24:22 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate llvmgcc_version testing variable.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96908 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar
2010-02-23 07:56:28 +00:00
parent 99d9863cce
commit 3d4d01bd39
7 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
docs/TestingGuide.html
View File

@ -761,9 +761,6 @@ substitutions</a></div>
<dd>The full path to the <tt>llvm-gxx</tt> executable as specified in the
configured LLVM environment</dd>
<dt><b>llvmgcc_version</b> (%llvmgcc_version)</dt>
<dd>The full version number of the <tt>llvm-gcc</tt> executable.</dd>
<dt><b>gccpath</b></dt>
<dd>The full path to the C compiler used to <i>build </i> LLVM. Note that
this might not be gcc.</dd>
@ -826,17 +823,15 @@ substitutions</a></div>
if the test fails. Such test cases are counted separately by DejaGnu. To
specify an expected fail, use the XFAIL keyword in the comments of the test
program followed by a colon and one or more regular expressions (separated by
a comma). The regular expressions allow you to XFAIL the test conditionally
by host platform. The regular expressions following the : are matched against
the target triplet or llvmgcc version number for the host machine. If there is
a match, the test is expected to fail. If not, the test is expected to
succeed. To XFAIL everywhere just specify <tt>XFAIL: *</tt>. When matching
the llvm-gcc version, you can specify the major (e.g. 3) or full version
(i.e. 3.4) number. Here is an example of an <tt>XFAIL</tt> line:</p>
a comma). The regular expressions allow you to XFAIL the test conditionally by
host platform. The regular expressions following the : are matched against the
target triplet for the host machine. If there is a match, the test is expected
to fail. If not, the test is expected to succeed. To XFAIL everywhere just
specify <tt>XFAIL: *</tt>. Here is an example of an <tt>XFAIL</tt> line:</p>
<div class="doc_code">
<pre>
; XFAIL: darwin,sun,llvmgcc4
; XFAIL: darwin,sun
</pre>
</div>

2
test/FrontendC/2007-09-17-WeakRef.c
View File

@ -1,6 +1,6 @@
// RUN: %llvmgcc -O1 -S %s -o - | grep icmp
// PR1678
// XFAIL: llvmgcc4.0.1
extern void B (void);
static __typeof(B) A __attribute__ ((__weakref__("B")));
int active (void)

1
test/Makefile
View File

@ -155,7 +155,6 @@ site.exp: FORCE
@echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
@echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp
@echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp
@echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
@echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
@echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
@echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> site.tmp

15
test/lib/llvm.exp
View File

@ -47,7 +47,7 @@ proc execOneLine { test PRS outcome lineno line } {
# cases.
proc substitute { line test tmpFile } {
global srcroot objroot srcdir objdir subdir target_triplet
global llvmgcc llvmgxx llvmgcc_version ocamlopt
global llvmgcc llvmgxx ocamlopt
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
global llvmdsymutil valgrind grep gas bugpoint_topts
set path [file join $srcdir $subdir]
@ -119,7 +119,7 @@ proc substitute { line test tmpFile } {
# This procedure runs the set of tests for the test_source_files array.
proc RunLLVMTests { test_source_files } {
global srcroot objroot srcdir objdir subdir target_triplet llvmgcc_version
global srcroot objroot srcdir objdir subdir target_triplet
set timeout 60
set path [file join $objdir $subdir]
@ -194,12 +194,6 @@ proc RunLLVMTests { test_source_files } {
if {$targetPASS != 1} {
set outcome XFAIL
}
} elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2] } {
if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } {
if {$targetPASS != 1} {
set outcome XFAIL
}
}
}
}
} elseif {[regexp {XTARGET:[ *](.+)} $line match targets]} {
@ -213,11 +207,6 @@ proc RunLLVMTests { test_source_files } {
} elseif { [regexp $target $target_triplet match] } {
set targetPASS 1
set outcome PASS
} elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2] } {
if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } {
set targetPASS 1
set outcome PASS
}
}
}
}

1
test/site.exp.in
View File

@ -3,7 +3,6 @@
set target_triplet "@TARGET_TRIPLE@"
set TARGETS_TO_BUILD "@TARGETS_TO_BUILD@"
set llvmgcc_langs "@LLVMGCC_LANGS@"
set llvmgcc_version "@LLVMGCC_VERSION@"
set llvmtoolsdir "@LLVM_TOOLS_DIR@"
set llvmlibsdir "@LLVM_LIBS_DIR@"
set llvm_bindings "@LLVM_BINDINGS@"

1
utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp
View File

@ -4,7 +4,6 @@
set target_triplet "x86_64-apple-darwin10"
set TARGETS_TO_BUILD "X86 Sparc PowerPC Alpha ARM Mips CellSPU PIC16 XCore MSP430 SystemZ Blackfin CBackend MSIL CppBackend"
set llvmgcc_langs "c,c++,objc,obj-c++"
set llvmgcc_version "4.2.1"
set prcontext "/usr/bin/tclsh8.4 /Volumes/Data/ddunbar/llvm/test/Scripts/prcontext.tcl"
set llvmtoolsdir "/Users/ddunbar/llvm.obj.64/Debug/bin"
set llvmlibsdir "/Users/ddunbar/llvm.obj.64/Debug/lib"

1
utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp
View File

@ -4,7 +4,6 @@
set target_triplet "x86_64-apple-darwin10"
set TARGETS_TO_BUILD "X86 Sparc PowerPC Alpha ARM Mips CellSPU PIC16 XCore MSP430 SystemZ Blackfin CBackend MSIL CppBackend"
set llvmgcc_langs "c,c++,objc,obj-c++"
set llvmgcc_version "4.2.1"
set prcontext "/usr/bin/tclsh8.4 /Volumes/Data/ddunbar/llvm/test/Scripts/prcontext.tcl"
set llvmtoolsdir "/Users/ddunbar/llvm.obj.64/Debug/bin"
set llvmlibsdir "/Users/ddunbar/llvm.obj.64/Debug/lib"