From 3d4d01bd39653ca869c4fca211fa861bfcf33dcc Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 23 Feb 2010 07:56:28 +0000 Subject: [PATCH] Eliminate llvmgcc_version testing variable. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96908 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/TestingGuide.html | 19 +++++++------------ test/FrontendC/2007-09-17-WeakRef.c | 2 +- test/Makefile | 1 - test/lib/llvm.exp | 15 ++------------- test/site.exp.in | 1 - .../ExampleTests/LLVM.InTree/test/site.exp | 1 - .../LLVM.OutOfTree/obj/test/site.exp | 1 - 7 files changed, 10 insertions(+), 30 deletions(-) diff --git a/docs/TestingGuide.html b/docs/TestingGuide.html index a92dbe99a6f..99d3fec3b89 100644 --- a/docs/TestingGuide.html +++ b/docs/TestingGuide.html @@ -761,9 +761,6 @@ substitutions
The full path to the llvm-gxx executable as specified in the configured LLVM environment
-
llvmgcc_version (%llvmgcc_version)
-
The full version number of the llvm-gcc executable.
-
gccpath
The full path to the C compiler used to build LLVM. Note that this might not be gcc.
@@ -821,22 +818,20 @@ substitutions

Sometimes it is necessary to mark a test case as "expected fail" or XFAIL. - You can easily mark a test as XFAIL just by including XFAIL: on a + You can easily mark a test as XFAIL just by including XFAIL: on a line near the top of the file. This signals that the test case should succeed 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 XFAIL: *. 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 XFAIL line:

+ 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 XFAIL: *. Here is an example of an XFAIL line:

-; XFAIL: darwin,sun,llvmgcc4
+; XFAIL: darwin,sun
diff --git a/test/FrontendC/2007-09-17-WeakRef.c b/test/FrontendC/2007-09-17-WeakRef.c index 3cdd47e4e08..6c420ea38a7 100644 --- a/test/FrontendC/2007-09-17-WeakRef.c +++ b/test/FrontendC/2007-09-17-WeakRef.c @@ -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) diff --git a/test/Makefile b/test/Makefile index 1d8da4c8356..1ae54f45e33 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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 diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 941b4f1289e..19a27296044 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -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 - } } } } diff --git a/test/site.exp.in b/test/site.exp.in index c0b487e1555..c760c2c1992 100644 --- a/test/site.exp.in +++ b/test/site.exp.in @@ -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@" diff --git a/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp b/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp index 7bb21abc27a..efa839e9ba0 100644 --- a/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp +++ b/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp @@ -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" diff --git a/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp b/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp index 7bb21abc27a..efa839e9ba0 100644 --- a/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp +++ b/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp @@ -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" -- 2.34.1