From a63d4341800224fcd5ef50c0509dc8a883fe1767 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 14 May 2021 15:33:17 -0700 Subject: [PATCH] refs #18011 disable some newly failing tests on cpp windows; refs #17946 increase timeout for tchannels (#18012) (cherry picked from commit 2ce592a209f4cd7f59c009a01e4ac4037e63a7bd) --- tests/cpp/temitlist.nim | 4 +++- tests/cpp/tempty_generic_obj.nim | 4 +++- tests/exception/tcpp_imported_exc.nim | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/cpp/temitlist.nim b/tests/cpp/temitlist.nim index 852537518a086..d446176fa477f 100644 --- a/tests/cpp/temitlist.nim +++ b/tests/cpp/temitlist.nim @@ -1,7 +1,9 @@ discard """ targets: "cpp" - output: '''6.0 + output: ''' +6.0 0''' +disabled: "windows" # pending bug #18011 """ # bug #4730 diff --git a/tests/cpp/tempty_generic_obj.nim b/tests/cpp/tempty_generic_obj.nim index 913c1ec3c48d6..6125190b4f0e3 100644 --- a/tests/cpp/tempty_generic_obj.nim +++ b/tests/cpp/tempty_generic_obj.nim @@ -1,7 +1,9 @@ discard """ targets: "cpp" - output: '''int + output: ''' +int float''' +disabled: "windows" # pending bug #18011 """ import typetraits diff --git a/tests/exception/tcpp_imported_exc.nim b/tests/exception/tcpp_imported_exc.nim index 8b96ca6350c2a..5195b48e7a11f 100644 --- a/tests/exception/tcpp_imported_exc.nim +++ b/tests/exception/tcpp_imported_exc.nim @@ -1,6 +1,7 @@ discard """ targets: "cpp" -output: '''caught as std::exception +output: ''' +caught as std::exception expected finally1 finally2 @@ -12,6 +13,7 @@ finally 2 expected cpp exception caught ''' +disabled: "windows" # pending bug #18011 """ type