Skip to content

fix #17325 linux 32bit CI; fix #17085 flaky test #17469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
narimiran merged 8 commits into from
Mar 24, 2021
Merged

fix #17325 linux 32bit CI; fix #17085 flaky test #17469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b71aca
fix #17325 linux 32bit CI
timotheecour Mar 23, 2021
bba1b03
disable other CI
timotheecour Mar 23, 2021
b00ef07
fix json
timotheecour Mar 23, 2021
fa119be
_
timotheecour Mar 23, 2021
0d77ce4
fix test
timotheecour Mar 23, 2021
65945dc
fix remaining issue in #17085 in which --gc:boehm was issuing a warni…
timotheecour Mar 23, 2021
b521876
undisable CI
timotheecour Mar 23, 2021
3b9ec15
use echo again in tests/gc/trace_globals.nim
timotheecour Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
Linux_amd64:
vmImage: 'ubuntu-16.04'
CPU: amd64
# Linux_i386:
# # bug #17325: fails on 'ubuntu-16.04' because it now errors with:
# # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed
# vmImage: 'ubuntu-18.04'
# CPU: i386
Linux_i386:
# bug #17325: fails on 'ubuntu-16.04' because it now errors with:
# g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed
vmImage: 'ubuntu-18.04'
CPU: i386
OSX_amd64:
vmImage: 'macOS-10.15'
CPU: amd64
Expand Down
7 changes: 4 additions & 3 deletions lib/pure/json.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,12 +1069,13 @@ when defined(nimFixedForwardGeneric):
dst = jsonNode.copy

proc initFromJson[T: SomeInteger](dst: var T; jsonNode: JsonNode, jsonPath: var string) =
when T is uint|uint64:
when T is uint|uint64 or (not defined(js) and int.sizeof == 4):
Copy link
Member Author

@timotheecour timotheecour Mar 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this logic can be refined in future work, but at least it's good to re-enable a non-broken i386

verifyJsonKind(jsonNode, {JInt, JString}, jsonPath)
case jsonNode.kind
of JString:
dst = T(parseBiggestUInt(jsonNode.str))
let x = parseBiggestUInt(jsonNode.str)
dst = cast[T](x)
else:
verifyJsonKind(jsonNode, {JInt}, jsonPath)
dst = T(jsonNode.num)
else:
verifyJsonKind(jsonNode, {JInt}, jsonPath)
Expand Down
13 changes: 12 additions & 1 deletion tests/gc/trace_globals.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
discard """
output: '''10000000
output: '''
10000000
10000000
10000000'''
"""

# bug #17085

#[
refs https://github.com/nim-lang/Nim/issues/17085#issuecomment-786466595
with --gc:boehm, this warning sometimes gets generated:
Warning: Repeated allocation of very large block (appr. size 14880768):
May lead to memory leak and poor performance.
nim CI now runs this test with `testWithoutBoehm` to avoid running it with --gc:boehm.
]#

proc init(): string =
for a in 0..<10000000:
result.add 'c'
Expand All @@ -16,6 +25,8 @@ proc f() =
var c {.global.} = init()

echo a.len
# `echo` intentional according to
# https://github.com/nim-lang/Nim/pull/17469/files/0c9e94cb6b9ebca9da7cb19a063fba7aa409748e#r600016573
echo b.len
echo c.len

Expand Down
2 changes: 1 addition & 1 deletion tests/stdlib/tjsonutils.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ template fn() =
block:
let a = (int32.high, uint32.high)
testRoundtrip(a): "[2147483647,4294967295]"
when not defined(js):
when int.sizeof > 4:
block:
let a = (int64.high, uint64.high)
testRoundtrip(a): "[9223372036854775807,18446744073709551615]"
Expand Down