Skip to content

miscellaneous bug fixes #13291

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
merged 3 commits into from
Jan 30, 2020
Merged

miscellaneous bug fixes #13291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1227fa
fix for emscripten etc
timotheecour Jan 28, 2020
480118f
add testcase for #13290
timotheecour Jan 29, 2020
b74ce00
replace deprecated isNilOrWhitespace
timotheecour Jan 29, 2020
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
2 changes: 1 addition & 1 deletion lib/pure/includes/osenv.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ when defined(windows) and not defined(nimscript):

else:
const
useNSGetEnviron = (defined(macosx) and not defined(ios)) or defined(nimscript)
useNSGetEnviron = (defined(macosx) and not defined(ios) and not defined(emscripten)) or defined(nimscript)

when useNSGetEnviron:
# From the manual:
Expand Down
2 changes: 1 addition & 1 deletion lib/system/timers.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ when defined(windows):

result = Nanos(float64(a.int64 - b.int64) * performanceCounterRate)

elif defined(macosx):
elif defined(macosx) and not defined(emscripten):
type
MachTimebaseInfoData {.pure, final,
importc: "mach_timebase_info_data_t",
Expand Down
2 changes: 1 addition & 1 deletion testament/htmlgen.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ proc generateTestResultPanelPartial(outfile: File, testResultRow: JsonNode) =
trId, name, target, category, action, resultDescription,
timestamp, result, resultSign, panelCtxClass, textCtxClass, bgCtxClass
)
if expected.isNilOrWhitespace() and gotten.isNilOrWhitespace():
if expected.isEmptyOrWhitespace() and gotten.isEmptyOrWhitespace():
outfile.generateHtmlTestresultOutputNone()
else:
outfile.generateHtmlTestresultOutputDetails(
Expand Down
9 changes: 9 additions & 0 deletions tests/system/tsystem_misc.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,12 @@ proc testMinMax(a,b: float32) =

testMinMax(0.0, NaN)
testMinMax(NaN, 0.0)


block:
type Foo = enum
k1, k2
var
a = {k1}
b = {k1,k2}
doAssert a < b