From patchwork Fri Jan 18 17:05:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: testsuite] clean up convoluted dg-final directive in vect-multitypes-12.c From: Janis Johnson X-Patchwork-Id: 213680 Message-Id: <50F980CE.6030609@mentor.com> To: "gcc-patches@gcc.gnu.org" Date: Fri, 18 Jan 2013 09:05:18 -0800 Test gcc.dg/vect/vect-multitypes uses Tcl conditions within a dg-final directive, which is something that DejaGnu handles but we strive not to do. It's now possible to use supported constructs to get the same result, so I've cleaned up the test and checked it in as obvious. I'm fixing this particular test because I want to add an xfail but want to keep that change separate from the cleanup. Janis 2013-01-18 Janis Johnson * gcc.dg/vect/vect-multitypes-12.c: Refactor dg-final directive. Index: gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c =================================================================== --- gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c (revision 195286) +++ gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c (working copy) @@ -38,7 +38,9 @@ return 0; } +/* bleah */ /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */ -/* { dg-final { if [ istarget sparc*-*-* ] { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail ilp32 } } else { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! vect_unpack } } } } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target sparc*-*-* xfail ilp32 } } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { { ! sparc*-*-* } && { ! vect_unpack } } } } } */ /* { dg-final { cleanup-tree-dump "vect" } } */