Skip to content
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.

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

"industrialize" skipping win64 CI #441

Merged
merged 4 commits into from
Sep 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ matrix:
fast_finish: false

platform:
- x86
- x64
- x86

install:
- git submodule update --init --recursive
Expand Down
7 changes: 7 additions & 0 deletions tests/official/fixtures_utils.nim
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,10 @@ proc parseTest*(path: string, Format: typedesc[Json or SSZ], T: typedesc): T =
stderr.write $Format & " load issue for file \"", path, "\"\n"
stderr.write err.formatMsg(path), "\n"
quit 1

template skipWin64*(body: untyped): untyped =
# Skip Win64 CI for https://github.com/status-im/nim-beacon-chain/issues/435
when defined(windows) and sizeof(int) == 8:
echo " [OSError] See #435. Ignoring in Windows 64-bit CI"
else:
body
7 changes: 4 additions & 3 deletions tests/official/test_fixture_bls.nim
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ const BLSDir = JsonTestsDir/"general"/"phase0"/"bls"
suite "Official - BLS tests":
test "Private to public key conversion":
for file in walkDirRec(BLSDir/"priv_to_pub"):
let t = parseTest(file, Json, BLSPrivToPub)
let implResult = t.input.pubkey()
check: implResult == t.output
skipWin64:
let t = parseTest(file, Json, BLSPrivToPub)
let implResult = t.input.pubkey()
check: implResult == t.output

test "Message signing":
for file in walkDirRec(BLSDir/"sign_msg"):
Expand Down
4 changes: 1 addition & 3 deletions tests/official/test_fixture_operations_deposits.nim
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ template runTest(testName: string, identifier: untyped) =
suite "Official - Operations - Deposits " & preset():
# TODO https://github.com/status-im/nim-beacon-chain/issues/435
# CI Win64 - "The parameter is incorrect"
when not (defined(windows) and sizeof(int) == 8):
skipWin64:
runTest("new deposit under max", new_deposit_under_max)
runTest("new deposit max", new_deposit_max)
runTest("new deposit over max", new_deposit_over_max)
Expand All @@ -78,5 +78,3 @@ suite "Official - Operations - Deposits " & preset():
# https://github.com/status-im/nim-beacon-chain/issues/407
runTest("wrong deposit for deposit count", wrong_deposit_for_deposit_count)
runTest("bad merkle proof", bad_merkle_proof)
else:
echo " Skipped for Windows 64-bit CI"
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ template runTest(identifier: untyped) =
suite "Official - Operations - Proposer slashing " & preset():
# TODO https://github.com/status-im/nim-beacon-chain/issues/435
# CI Win64 - "The parameter is incorrect"
when not (defined(windows) and sizeof(int) == 8):
skipWin64:
runTest(success)
runTest(invalid_sig_1)
runTest(invalid_sig_2)
Expand All @@ -77,5 +77,3 @@ suite "Official - Operations - Proposer slashing " & preset():
runTest(proposer_is_not_activated)
runTest(proposer_is_slashed)
runTest(proposer_is_withdrawn)
else:
echo " Skipped for Windows 64-bit CI"
8 changes: 3 additions & 5 deletions tests/official/test_fixture_operations_transfer.nim
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ template runTest(identifier: untyped) =
suite "Official - Operations - Transfers " & preset():
# TODO https://github.com/status-im/nim-beacon-chain/issues/435
# CI Win64 - "The parameter is incorrect"
when not (defined(windows) and sizeof(int) == 8):
when const_preset == "minimal":
when const_preset == "minimal":
skipWin64:
runTest(success_non_activated)
runTest(success_withdrawable)
runTest(success_active_above_max_effective)
Expand All @@ -91,7 +91,5 @@ suite "Official - Operations - Transfers " & preset():
runTest(non_existent_sender)
runTest(non_existent_recipient)
runTest(invalid_pubkey)
else:
echo " No transfer tests in mainnet preset"
else:
echo " Skipped for Windows 64-bit CI"
echo " No transfer tests in mainnet preset"