From patchwork Tue Sep 16 09:37:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 390020 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1A047140082 for ; Tue, 16 Sep 2014 19:37:25 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=EguZk//FkijIhY4HY q7pi8aySGbyly//BFFeOgzjjQMdkUKiR27sbLZ+/q7+7zj3NhHxAozKgfvzYwygR X6kfgNL6O/QjDwS9SmJy/eSsBsF4yJGiGrXIZwI7GUfcZrd5korJ6IiprlmMEd3h +8gqXW23HvnYyqmujqTf8A0sUI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; s=default; bh=HhCINsi80oF0r6aMcnz+7CU QUIY=; b=kyC4VB3CPWuASSoOHk+duvko1OVIQHsGZ0tLlYHjruMIylnNcAqTH9v j3nQ5L1w6sZGy2HHFHoEaiUOs0dSrVlIuCcEkRkPV/ZFTdNL2ptoSl2UEYHsKCJ/ dDIx5xm6BjhhC99tAd+81TbvtsPsH7K+OWQFqunD07jVdmEpfzkQ= Received: (qmail 3319 invoked by alias); 16 Sep 2014 09:37:12 -0000 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 Received: (qmail 3297 invoked by uid 89); 16 Sep 2014 09:37:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 16 Sep 2014 09:37:09 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8G9b6L4016196 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 16 Sep 2014 05:37:06 -0400 Received: from tucnak.zalov.cz (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8G9b487017459 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Sep 2014 05:37:05 -0400 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.14.8/8.14.7) with ESMTP id s8G9b2KQ025357; Tue, 16 Sep 2014 11:37:02 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.14.8/8.14.8/Submit) id s8G9b0L2025356; Tue, 16 Sep 2014 11:37:00 +0200 Date: Tue, 16 Sep 2014 11:37:00 +0200 From: Jakub Jelinek To: VandeVondele Joost Cc: Tobias Burnus , Mike Stump , "gcc-patches@gcc.gnu.org" , "fortran@gcc.gnu.org" Subject: Re: [PATCH] Avoid inter-test dependencies in gfortran.dg (PR fortran/56408) Message-ID: <20140916093700.GW17454@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <20140915161347.GN17454@tucnak.redhat.com> <908103EDB4893A42920B21D3568BFD9315104045@MBX13.d.ethz.ch> <20140916084246.GQ17454@tucnak.redhat.com> <20140916084717.GR17454@tucnak.redhat.com> <20140916091613.GT17454@tucnak.redhat.com> <908103EDB4893A42920B21D3568BFD93151040ED@MBX13.d.ethz.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <908103EDB4893A42920B21D3568BFD93151040ED@MBX13.d.ethz.ch> User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes On Tue, Sep 16, 2014 at 09:31:04AM +0000, VandeVondele Joost wrote: > > > Does the following patch fix this? Works for me with dejagnu 1.5.1. > > and works for me with 1.4.4 Ok, I've committed this to trunk then, so that testing works again for those with old dejagnu. 2014-09-16 Jakub Jelinek PR fortran/56408 * gfortran.dg/dg.exp (dg-compile-aux-modules): Workaround missing nexted dg-test call support in dejaGNU 1.4.4. Jakub --- gcc/testsuite/gfortran.dg/dg.exp.jj 2014-09-15 21:45:45.000000000 +0200 +++ gcc/testsuite/gfortran.dg/dg.exp 2014-09-16 11:15:26.766004692 +0200 @@ -39,8 +39,18 @@ proc dg-compile-aux-modules { args } { error "dg-set-target-env-var: needs one argument" return } + + set level [info level] + if { [info procs dg-save-unknown] != [list] } { + rename dg-save-unknown dg-save-unknown-level-$level + } + dg-test $gfortran_test_path/[lindex $args 1] "" $gfortran_aux_module_flags - # cleanup-modules isn't intentionally invoked here. + # cleanup-modules is intentionally not invoked here. + + if { [info procs dg-save-unknown-level-$level] != [list] } { + rename dg-save-unknown-level-$level dg-save-unknown + } } # Main loop.