Skip to content

Commit bf22b44

Browse files
authored
miscellaneous bug fixes (#13291)
* fix for emscripten etc * add testcase for #13290 * replace deprecated isNilOrWhitespace
1 parent 81a4379 commit bf22b44

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

lib/pure/includes/osenv.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ when defined(windows) and not defined(nimscript):
6868

6969
else:
7070
const
71-
useNSGetEnviron = (defined(macosx) and not defined(ios)) or defined(nimscript)
71+
useNSGetEnviron = (defined(macosx) and not defined(ios) and not defined(emscripten)) or defined(nimscript)
7272

7373
when useNSGetEnviron:
7474
# From the manual:

lib/system/timers.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ when defined(windows):
3131

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

34-
elif defined(macosx):
34+
elif defined(macosx) and not defined(emscripten):
3535
type
3636
MachTimebaseInfoData {.pure, final,
3737
importc: "mach_timebase_info_data_t",

testament/htmlgen.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ proc generateTestResultPanelPartial(outfile: File, testResultRow: JsonNode) =
5252
trId, name, target, category, action, resultDescription,
5353
timestamp, result, resultSign, panelCtxClass, textCtxClass, bgCtxClass
5454
)
55-
if expected.isNilOrWhitespace() and gotten.isNilOrWhitespace():
55+
if expected.isEmptyOrWhitespace() and gotten.isEmptyOrWhitespace():
5656
outfile.generateHtmlTestresultOutputNone()
5757
else:
5858
outfile.generateHtmlTestresultOutputDetails(

tests/system/tsystem_misc.nim

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,12 @@ proc testMinMax(a,b: float32) =
184184

185185
testMinMax(0.0, NaN)
186186
testMinMax(NaN, 0.0)
187+
188+
189+
block:
190+
type Foo = enum
191+
k1, k2
192+
var
193+
a = {k1}
194+
b = {k1,k2}
195+
doAssert a < b

0 commit comments

Comments
 (0)