From f01730567d2e374d4e63ceaccaace1ea7e9b2508 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 14 May 2021 12:52:38 -0700 Subject: [PATCH 1/3] 1 codeblock=>runnableExamples --- lib/system.nim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/system.nim b/lib/system.nim index 9317c34404f0a..be30665ddff9f 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -1317,10 +1317,10 @@ proc del*[T](x: var seq[T], i: Natural) {.noSideEffect.} = ## ## See also: ## * `delete <#delete,seq[T],Natural>`_ for preserving the order - ## - ## .. code-block:: Nim - ## var i = @[1, 2, 3, 4, 5] - ## i.del(2) # => @[1, 2, 5, 4] + runnableExamples: + var a = @[10, 11, 12, 13, 14] + a.del(2) + assert a == @[10, 11, 14, 13] let xl = x.len - 1 movingCopy(x[i], x[xl]) setLen(x, xl) From 5ef49e8f3e7d113c6ad8cd51d91fb89b7538473b Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 14 May 2021 14:26:41 -0700 Subject: [PATCH 2/3] disable 3 windows cpp tests, refs #18012 --- 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 From 946f4acb92638390d79036784f55f4efedca0454 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 14 May 2021 14:28:07 -0700 Subject: [PATCH 3/3] mitigate bug #17946, increase timeout for tchannels --- tests/stdlib/tchannels.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/stdlib/tchannels.nim b/tests/stdlib/tchannels.nim index d609eec784825..492faf500c35b 100644 --- a/tests/stdlib/tchannels.nim +++ b/tests/stdlib/tchannels.nim @@ -1,5 +1,5 @@ discard """ - timeout: 20.0 # but typically < 1s (in isolation but other tests running in parallel can affect this since based on epochTime) + timeout: 60.0 # but typically < 1s (in isolation but other tests running in parallel can affect this since based on epochTime) disabled: "freebsd" matrix: "--gc:arc --threads:on; --gc:arc --threads:on -d:danger" """