Skip to content

Commit

Permalink
Merge pull request #16230 from MinaProtocol/feature/use-native-number…
Browse files Browse the repository at this point in the history
…-of-cores-in-dune

[master] Remove hard-coded assumption that test runners have 16 cores
  • Loading branch information
mrmr1993 authored Oct 28, 2024
2 parents d3d8b6a + e63e130 commit 2a404f0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion buildkite/scripts/fuzzy-zkapp-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export LIBP2P_NIXLESS=1 PATH=/usr/lib/go/bin:$PATH GO=/usr/lib/go/bin/go
# skip running all of the tests that have already succeeded, since dune will
# only retry those tests that failed.
echo "--- Run fuzzy zkapp tests"
time dune exec "${path}" --profile="${profile}" -j16 -- --timeout "${timeout}" --individual-test-timeout "${individual_test_timeout}" --seed "${RANDOM}"
time dune exec "${path}" --profile="${profile}" -- --timeout "${timeout}" --individual-test-timeout "${individual_test_timeout}" --seed "${RANDOM}"
STATUS=$?
if [ "$STATUS" -ne 0 ]; then
./scripts/link-coredumps.sh && exit "$STATUS"
Expand Down
8 changes: 4 additions & 4 deletions buildkite/scripts/unit-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ export LIBP2P_NIXLESS=1 PATH=/usr/lib/go/bin:$PATH GO=/usr/lib/go/bin/go
time make build

echo "--- Build all targets"
dune build "${path}" --profile="${profile}" -j16
dune build "${path}" --profile="${profile}"

echo "--- Check for changes to verification keys"
time dune runtest "src/app/print_blockchain_snark_vk" --profile="${profile}" -j16
time dune runtest "src/app/print_blockchain_snark_vk" --profile="${profile}"

# Turn on the proof-cache assertion, so that CI will fail if the proofs need to
# be updated.
Expand All @@ -35,8 +35,8 @@ export ERROR_ON_PROOF=true
# skip running all of the tests that have already succeeded, since dune will
# only retry those tests that failed.
echo "--- Run unit tests"
time dune runtest "${path}" --profile="${profile}" -j16 || \
time dune runtest "${path}" --profile="${profile}" || \
(./scripts/link-coredumps.sh && \
echo "--- Retrying failed unit tests" && \
time dune runtest "${path}" --profile="${profile}" -j16 || \
time dune runtest "${path}" --profile="${profile}" || \
(./scripts/link-coredumps.sh && false))

0 comments on commit 2a404f0

Please sign in to comment.