[PATCH] [gcc-8-branch] Fix recent unique_ptr regressions

[Jonathan Wakely]

These test changes should have been committed with r275193.

        * testsuite/20_util/unique_ptr/assign/48635_neg.cc: Replace dg-error
        with dg-prune-output for enable_if failure.
        * testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc: Add
        dg-prune-output for enable_if failure.

Tested x86_64-linux (properly this time), committed to gcc-8-branch.


commit 5514ed57565e009de51831298e81718e3278a7cd
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Mon Sep 2 08:51:49 2019 +0100

    Fix recent unique_ptr regressions
    
    These test changes should have been committed with r275193.
    
            * testsuite/20_util/unique_ptr/assign/48635_neg.cc: Replace dg-error
            with dg-prune-output for enable_if failure.
            * testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc: Add
            dg-prune-output for enable_if failure.

diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc 
b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc
index b22d0e123b4..23a5eb007a1 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc
@@ -42,10 +42,9 @@ void f()
   std::unique_ptr<int, D&> ud(nullptr, d);
   ub = std::move(ud); // { dg-error "no match" }
   ub2 = ud; // { dg-error "no match" }
-// { dg-error "no type" "" { target *-*-* } 307 }
 
   std::unique_ptr<int[], B&> uba(nullptr, b);
   std::unique_ptr<int[], D&> uda(nullptr, d);
   uba = std::move(uda); // { dg-error "no match" }
-// { dg-error "no type" "" { target *-*-* } 566 }
 }
+// { dg-prune-output "no type" }
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc 
b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc
index c1b1c9efc64..7e820ba129a 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc
@@ -39,7 +39,7 @@ test07()
   std::unique_ptr<const A[]> cA3(p); // { dg-error "no matching function" }
   std::unique_ptr<volatile A[]> vA3(p); // { dg-error "no matching function" }
   std::unique_ptr<const volatile A[]> cvA3(p); // { dg-error "no matching 
function" }
-  // { dg-error "no type" "" { target *-*-* } 473 }
+  // { dg-prune-output "no type" }
 }
 
 template<typename T>