From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by sourceware.org (Postfix) with ESMTPS id CCB9A3857BA4 for ; Fri, 28 Oct 2022 17:15:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CCB9A3857BA4 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com Received: by mail-qv1-xf2e.google.com with SMTP id e15so4481464qvo.4 for ; Fri, 28 Oct 2022 10:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=FG7nZjqM6pciNpCrL451025XVW+wgEYSFz89iTVEGz8=; b=bCPjz/uggB8hl/xfTp3/JTTtdHbNVVc4oEDcfFjzqf0Re3o4SpPKSElSO+T8OvQKSE DzJhe6pOcoZSXvzjc1SNA2nR5MHQXcy3ABtG+Na4j4UTKXmx4Z+ZD+j9jKMFIPRGKZER jBH65SRwWc9GPVZ3zrFyRMwwkBDgZ/+VAl7ic= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FG7nZjqM6pciNpCrL451025XVW+wgEYSFz89iTVEGz8=; b=BfUCLy6RmaOAB9YS8aAhucdzXAlhx78oktkQl+sdAfCFPe7tEslGLJX3ImbtxebLr2 PQol6+bQiczoNZK4ncx913ZhTnJ1pgnlBxRdCGcMRMRaPtaUPHMU/PCy+ARmw9nJ1pSd O3D2WutvovvYgNQQyyYX3D6OYHXpw2JBCYluzqzPhrGTWkYQrYKt577iuFb4ED/UYi4A /ZTaXc3H/3oeZV8rJPJX/57ezXa5DaYLPVtIRvZF6tkOIJnkNgTTvu/+eRIl3qLDWEpb Dr9Go0y4dwstrVEWBavW/FrOioKZBLjSGmymzmuV6i+rsY3nLPGcvuum/FR86Y7FonYi A53w== X-Gm-Message-State: ACrzQf1a9lt4NrSapqC7NkAlkT6pBSNVg96JWUb5drwzbsNkwlj0IluK KkNLdEQZU/5EYaOVa8JS8/r/Vg== X-Google-Smtp-Source: AMsMyM5x2NthBRYnq9LDPud47jtfO489pGWETcRR6cb+5/yongx/yUSmIWcEKiQ9Malhdb4h6jqEAA== X-Received: by 2002:a05:6214:d01:b0:4bb:b4f9:cb8b with SMTP id 1-20020a0562140d0100b004bbb4f9cb8bmr367181qvh.9.1666977356247; Fri, 28 Oct 2022 10:15:56 -0700 (PDT) Received: from localhost (cpe-142-105-146-128.nycap.res.rr.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id ff12-20020a05622a4d8c00b0039cb5c9dbacsm2637434qtb.22.2022.10.28.10.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 10:15:55 -0700 (PDT) Date: Fri, 28 Oct 2022 13:15:54 -0400 From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org, brad.king@kitware.com, dmalcolm@redhat.com, mliska@suse.cz, anlauf@gmx.de Subject: Re: [PATCH v2 3/3] p1689r5: initial support Message-ID: References: <20221027231645.67623-1-ben.boeckel@kitware.com> <20221027231645.67623-4-ben.boeckel@kitware.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20221027231645.67623-4-ben.boeckel@kitware.com> User-Agent: Mutt/2.2.7 (2022-08-07) X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Oct 27, 2022 at 19:16:44 -0400, Ben Boeckel wrote: > diff --git a/gcc/testsuite/g++.dg/modules/modules.exp b/gcc/testsuite/g++.dg/modules/modules.exp > index afb323d0efd..7fe8825144f 100644 > --- a/gcc/testsuite/g++.dg/modules/modules.exp > +++ b/gcc/testsuite/g++.dg/modules/modules.exp > @@ -28,6 +28,7 @@ > # { dg-module-do [link|run] [xfail] [options] } # link [and run] > > load_lib g++-dg.exp > +load_lib modules.exp > > # If a testcase doesn't have special options, use these. > global DEFAULT_CXXFLAGS > @@ -237,6 +238,13 @@ proc cleanup_module_files { files } { > } > } > > +# delete the specified set of dep files > +proc cleanup_dep_files { files } { > + foreach file $files { > + file_on_host delete $file > + } > +} > + > global testdir > set testdir $srcdir/$subdir > proc srcdir {} { > @@ -310,6 +318,7 @@ foreach src [lsort [find $srcdir/$subdir {*_a.[CHX}]] { > set std_list [module-init $src] > foreach std $std_list { > set mod_files {} > + set dep_files {} > global module_do > set module_do {"compile" "P"} > set asm_list {} > @@ -346,6 +355,8 @@ foreach src [lsort [find $srcdir/$subdir {*_a.[CHX}]] { > set mod_files [find $DEFAULT_REPO *.gcm] > } > cleanup_module_files $mod_files > + > + cleanup_dep_files $dep_files > } > } > } These `cleanup_dep_files` hunks are leftovers from my attempts at getting the P1689 and flags tests working; they'll be gone in v3. --Ben