I am doing a merge from trunk and noticed the g++.dg/dg.exp are all failing because we are trying to run the memmodel/ tests outside of the memmodel/ directory. The memmodel tests must be excluded from the dg.exp list, since they are handled specially.

Fixed thusly.

Applied to branch.
        * gcc.dg/dg.exp: Exclude memmodel tests.

Index: g++.dg/dg.exp
===================================================================
--- g++.dg/dg.exp       (revision 178607)
+++ g++.dg/dg.exp       (working copy)
@@ -48,6 +48,7 @@ set tests [prune $tests $srcdir/$subdir/
 set tests [prune $tests $srcdir/$subdir/torture/*]
 set tests [prune $tests $srcdir/$subdir/graphite/*]
 set tests [prune $tests $srcdir/$subdir/guality/*]
+set tests [prune $tests $srcdir/$subdir/memmodel/*]
 
 # Main loop.
 dg-runtest $tests "" $DEFAULT_CXXFLAGS

Reply via email to