Skip to content

dfx.nix: test ic-http-agent without parallelism #440

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
mergify merged 2 commits into from
Mar 11, 2020
Merged

dfx.nix: test ic-http-agent without parallelism #440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cad2e74
dfx.nix: test ic-http-agent without parallelism
basvandijk Mar 9, 2020
0935b9d
Merge branch 'master' into basvandijk/test-ic-http-agent-without-para…
mergify[bot] Mar 11, 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
8 changes: 4 additions & 4 deletions dfx.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ let
".*Cargo\.lock$"
"^.cargo/config$"
];
cargoTestCommands = _: [
''cargo $cargo_options test $cargo_test_options --workspace --exclude ic-http-agent''

@eftychis eftychis Mar 10, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can we do test --all (that is add --all in the options?) I am not sure it is set.

@basvandijk basvandijk Mar 11, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Note that --all is a deprecated alias for --workspace which we already pass.

''RUST_TEST_THREADS=1 cargo $cargo_options test $cargo_test_options -p ic-http-agent''
];
static = pkgs.stdenv.isLinux;

override = _: {
RUST_TEST_THREADS = 1;
};
};

# add extra executables used when linting
Expand Down
2 changes: 1 addition & 1 deletion nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"common": {
"ref": "master",
"repo": "ssh://git@github.com/dfinity-lab/common",
"rev": "18b21123f4bf7208be86e2f8865cc6f2328f09c2",
"rev": "c022ff9f16ed0b9e3eb4ed97f26b493de3858df7",
"type": "git"
},
"dfinity": {
Expand Down