Fix failing tests after PR libstdc++/85965

Fix failing tests after PR libstdc++/85965

[François Dumont]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Since commit 5d3695d03b7bdade9f4d05d2b those tests are failing.

     * testsuite/23_containers/unordered_map/48101_neg.cc: Adapt dg-error
     after PR libstdc++/85965 fix.
     * testsuite/23_containers/unordered_multimap/48101_neg.cc: Likewise.
     * testsuite/23_containers/unordered_multiset/48101_neg.cc: Likewise.
     * testsuite/23_containers/unordered_set/48101_neg.cc

It is quite trivial but I wonder if there is another plan to restore 
those static assertions differently.

Ok to commit ?

François


[-- Attachment #2: 48101_neg.patch --]
[-- Type: text/x-patch, Size: 2823 bytes --]

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/48101_neg.cc
index 8d823dfa476..77c0e9ce681 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/48101_neg.cc
@@ -27,7 +27,4 @@ test01()
   c2.find(2); // { dg-error "here" }
 }
 
-// { dg-error "hash function must be invocable" "" { target *-*-* } 0 }
-// { dg-error "key equality predicate must be invocable" "" { target *-*-* } 0 }
-// { dg-prune-output "use of deleted function" }
 // { dg-prune-output "no match for call" }
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101_neg.cc
index a81615b3607..7db7dcb2b5d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101_neg.cc
@@ -27,7 +27,4 @@ test01()
   c2.find(2); // { dg-error "here" }
 }
 
-// { dg-error "hash function must be invocable" "" { target *-*-* } 0 }
-// { dg-error "key equality predicate must be invocable" "" { target *-*-* } 0 }
-// { dg-prune-output "use of deleted function" }
 // { dg-prune-output "no match for call" }
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101_neg.cc
index 03ddb898d6c..444ca210c58 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101_neg.cc
@@ -29,8 +29,5 @@ test01()
 }
 
 // { dg-error "non-const, non-volatile value_type" "" { target *-*-* } 0 }
-// { dg-error "hash function must be invocable" "" { target *-*-* } 0 }
-// { dg-error "key equality predicate must be invocable" "" { target *-*-* } 0 }
-// { dg-prune-output "use of deleted function" }
 // { dg-prune-output "must have the same value_type as its allocator" }
 // { dg-prune-output "no match for call" }
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/48101_neg.cc
index e79d3769248..2c02620bccb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/48101_neg.cc
@@ -29,8 +29,5 @@ test01()
 }
 
 // { dg-error "non-const, non-volatile value_type" "" { target *-*-* } 0 }
-// { dg-error "hash function must be invocable" "" { target *-*-* } 0 }
-// { dg-error "key equality predicate must be invocable" "" { target *-*-* } 0 }
-// { dg-prune-output "use of deleted function" }
 // { dg-prune-output "must have the same value_type as its allocator" }
 // { dg-prune-output "no match for call" }

Re: Fix failing tests after PR libstdc++/85965

[Jonathan Wakely]

On 18/07/19 07:41 +0200, François Dumont wrote:
>Since commit 5d3695d03b7bdade9f4d05d2b those tests are failing.
>
>    * testsuite/23_containers/unordered_map/48101_neg.cc: Adapt dg-error
>    after PR libstdc++/85965 fix.
>    * testsuite/23_containers/unordered_multimap/48101_neg.cc: Likewise.
>    * testsuite/23_containers/unordered_multiset/48101_neg.cc: Likewise.
>    * testsuite/23_containers/unordered_set/48101_neg.cc
>
>It is quite trivial but I wonder if there is another plan to restore 
>those static assertions differently.
>
>Ok to commit ?

No. I don't see these failures. With the first change applied, I see a
new failure.

The patch seems wrong.

Re: Fix failing tests after PR libstdc++/85965

[François Dumont]

Got it, it is my PR 68303 patch which was introducing this regression. I 
fix it to restore those assertions.

You'll see once the awaiting hashtable patches are in...

On 7/18/19 12:18 PM, Jonathan Wakely wrote:
> On 18/07/19 07:41 +0200, François Dumont wrote:
>> Since commit 5d3695d03b7bdade9f4d05d2b those tests are failing.
>>
>>     * testsuite/23_containers/unordered_map/48101_neg.cc: Adapt dg-error
>>     after PR libstdc++/85965 fix.
>>     * testsuite/23_containers/unordered_multimap/48101_neg.cc: Likewise.
>>     * testsuite/23_containers/unordered_multiset/48101_neg.cc: Likewise.
>>     * testsuite/23_containers/unordered_set/48101_neg.cc
>>
>> It is quite trivial but I wonder if there is another plan to restore 
>> those static assertions differently.
>>
>> Ok to commit ?
>
> No. I don't see these failures. With the first change applied, I see a
> new failure.
>
> The patch seems wrong.
>
>
>