From patchwork Fri Jun 17 01:11:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 100749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 9B114B6F5A for ; Fri, 17 Jun 2011 11:10:06 +1000 (EST) Received: (qmail 11794 invoked by alias); 17 Jun 2011 01:10:05 -0000 Received: (qmail 11785 invoked by uid 22791); 17 Jun 2011 01:10:04 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 17 Jun 2011 01:09:50 +0000 Received: (qmail 11947 invoked from network); 17 Jun 2011 01:09:49 -0000 Received: from unknown (HELO ?192.168.1.5?) (janisjo@127.0.0.2) by mail.codesourcery.com with ESMTPA; 17 Jun 2011 01:09:49 -0000 Message-ID: <4DFAA9B9.1010100@codesourcery.com> Date: Thu, 16 Jun 2011 18:11:21 -0700 From: Janis Johnson User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] scan-dump variants to use 'unresolved' for missing dump file X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Currently, scan-dump variants treat a missing dump file as a failure and append ": dump file does not exist" to the test message that would be used with pass or fail. This patch treats it as unresolved instead, using the same test message as for pass/fail and reporting the reason in the log file. Tested with dummy tests that use all of these procs for either pass, fail, or unresolved. OK for trunk, and later for 4.6? Janis 2011-06-16 Janis Johnson * lib/scandump.exp (scan-dump, scan-dump-times, scan-dump-not, scan-dump-dem, scan-dump-dem-not): Treat a missing dump file as unresolved and report the reason to the log file. Index: lib/scandump.exp =================================================================== --- lib/scandump.exp (revision 175083) +++ lib/scandump.exp (working copy) @@ -55,7 +55,8 @@ set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -97,7 +98,8 @@ set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 3]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -139,7 +141,8 @@ set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -190,7 +193,8 @@ set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return } @@ -241,7 +245,8 @@ set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 2]]" if { $output_file == "" } { - fail "$testname: dump file does not exist" + verbose -log "$testcase: dump file does not exist" + unresolved "$testname" return }