diff mbox

Don't run OpenACC C++ test twice (was: [gomp4] OpenACC / C++)

Message ID 87y4clh2g1.fsf@kepler.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge Dec. 23, 2015, 10:41 a.m. UTC 
Hi!

On Mon, 20 Oct 2014 12:17:41 +0200, I wrote:
> I have just applied in r216456: »Enable compiler testing
> for OpenACC/C++«.

>     	* g++.dg/goacc-gomp/goacc-gomp.exp: New file.
>     	* g++.dg/goacc/goacc.exp: Likewise.

I failed to realize that g++.dg/dg.exp has a "catch all" rule, and to
avoid running the OpenACC tests twice, I applied the following, as
obvious, in r231925:

commit a1393a2ae7831f6af9876f125e1f508a92e39c1d
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Wed Dec 23 10:39:58 2015 +0000

    Don't run OpenACC C++ test twice
    
    	gcc/testsuite/
    	* g++.dg/dg.exp (tests): Prune "goacc/*" and "goacc-gomp/*" files.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231925 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog     |    4 ++++
 gcc/testsuite/g++.dg/dg.exp |    2 ++
 2 files changed, 6 insertions(+)



Grüße
 Thomas
diff mbox

Patch

diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
index 0620068..1924c24 100644
--- gcc/testsuite/ChangeLog
+++ gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@ 
+2015-12-23  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* g++.dg/dg.exp (tests): Prune "goacc/*" and "goacc-gomp/*" files.
+
 2015-12-23  David Sherwood  <david.sherwood@arm.com>
 
 	* gcc.target/arm/fmaxmin.x: New file used by tests below.
diff --git gcc/testsuite/g++.dg/dg.exp gcc/testsuite/g++.dg/dg.exp
index b77c3c5..570a818 100644
--- gcc/testsuite/g++.dg/dg.exp
+++ gcc/testsuite/g++.dg/dg.exp
@@ -45,6 +45,8 @@  set tests [prune $tests $srcdir/$subdir/plugin/*]
 set tests [prune $tests $srcdir/$subdir/special/*]
 set tests [prune $tests $srcdir/$subdir/tls/*]
 set tests [prune $tests $srcdir/$subdir/vect/*]
+set tests [prune $tests $srcdir/$subdir/goacc/*]
+set tests [prune $tests $srcdir/$subdir/goacc-gomp/*]
 set tests [prune $tests $srcdir/$subdir/gomp/*]
 set tests [prune $tests $srcdir/$subdir/tree-prof/*]
 set tests [prune $tests $srcdir/$subdir/torture/*]