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

Improve memory footprint of some test #4696

Merged
merged 24 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
55bef14
ouroboros-network-testing: ShrinkCarefully
coot Oct 20, 2023
a00e9a7
ouroboros-network-testing: improved prop_shrink_nonequal
coot Oct 20, 2023
b7328a6
peer-selection-test: nightly prop_shrink_nonequal_GovernorMockEnviron…
coot Oct 20, 2023
7859aed
server-tests: syntax
coot Oct 20, 2023
1b3a9fa
server-tests: prop_connection_manager_pruning
coot Oct 20, 2023
5b1f200
server-tests: validate_transitions
coot Oct 20, 2023
52adeec
server-tests: prop_connection_manager_counters & prop_timeouts_enforced
coot Oct 20, 2023
65a1b58
server-tests: refactor prop_inbound_governor_prunning
coot Oct 20, 2023
1c19666
server-tests: prop_inbound_governor_valid_transition_order
coot Oct 20, 2023
6687858
ouroboros-network-protocols: removed unused GHC extensions
coot Oct 20, 2023
bbe9b8c
ouroboros-network-protocols: imporoved performance of handshake tests
coot Oct 20, 2023
65b5992
Use typed-protocols-0.1.1
coot Oct 20, 2023
2fd8295
Updated hackageNix
coot Oct 20, 2023
f4dac7d
compile bitvec with -simd flag
coot Oct 20, 2023
e6456da
network-mux: allow to use RTS options in mux tests
coot Oct 23, 2023
757aa73
server-tests: code style
coot Oct 23, 2023
010d9b2
connection-manager: bug fix
coot Oct 25, 2023
de110fd
inbound-governor: fixed assertion
coot Oct 25, 2023
d56c9d4
snocket: derive TestAddress Show instance using Quiet
coot Oct 25, 2023
908d837
sim-net: existential ResourceException
coot Oct 25, 2023
f143511
server-tests: white list allowed exceptions
coot Oct 25, 2023
8b76994
p2p: ghc warning
coot Oct 25, 2023
242085f
ouroboros-network-framework: updated CHANGELOG file
coot Oct 25, 2023
d60f84a
flake.nix: added heap limits
coot Oct 25, 2023
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
5 changes: 4 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2023-09-10T00:10:54Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2023-08-04T14:05:48Z
, cardano-haskell-packages 2023-10-23T08:59:58Z

packages: ./cardano-ping
./monoidal-synchronisation
Expand All @@ -34,6 +34,9 @@ packages: ./cardano-ping
tests: True
benchmarks: True

package bitvec
flags: -simd

package cardano-ping
flags: +asserts

Expand Down
154 changes: 115 additions & 39 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
];

# default compiler used on all systems, also provided within the shell
defaultCompiler = "ghc962";
defaultCompiler = "ghc963";

# the compiler used for cross compilation
# alternative compilers only used on Linux
Expand Down Expand Up @@ -129,13 +129,21 @@
# specific enough, or doesn't allow setting these.
modules = [
({pkgs, ...}: {
# pkgs are instatiated for the host platform
# We impose limit heap size limit when running some of the tests
# to discover space leaks Once #4698 and #4699 are done we can
# further constrain the heap size.
preCheck = lib.mkForce ''
export GHCRTS=-M200M
'';

# pkgs are instantiated for the host platform
packages.ouroboros-network-protocols.components.tests.cddl.build-tools = [ pkgs.cddl pkgs.cbor-diag ];
packages.ouroboros-network-protocols.components.tests.cddl.preCheck = "export HOME=`pwd`";

# don't run checks using Wine when cross compiling
packages.ntp-client.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
packages.network-mux.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
packages.network-mux.components.tests.test.preCheck = "export GHCRTS=-M350M";
packages.ouroboros-network-api.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
packages.ouroboros-network-protocols.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
packages.ouroboros-network-framework.components.tests.sim-tests.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
Expand Down
1 change: 1 addition & 0 deletions network-mux/network-mux.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ test-suite test
else
build-depends: process
ghc-options: -threaded
-rtsopts
-Wall
-fno-ignore-asserts
-Wcompat
Expand Down
1 change: 1 addition & 0 deletions ntp-client/ntp-client.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ test-suite test
ghc-options: -Wall
-Wunused-packages
-threaded
-rtsopts

executable demo-ntp-client
hs-source-dirs: demo
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-network-api/ouroboros-network-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ library
network-mux ^>=0.4,
strict-stm,
si-timers,
typed-protocols ^>=0.1.0.6,
typed-protocols ^>=0.1.1,

ghc-options: -Wall
-Wno-unticked-promoted-constructors
Expand Down
4 changes: 4 additions & 0 deletions ouroboros-network-framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@

### Breaking changes

* `ResourceException` is now an existential type.

### Non-breaking changes

* Split `test` component into `io-tests` and `sim-tests`.
* `demo-ping-pong`: improved tracer.
* Fixed a bug in `connection-manager` which could result in leaking
a connection.

## 0.9.0.0 -- 2023-08-21

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ library
, ouroboros-network-api
^>=0.5.1
, ouroboros-network-testing
, typed-protocols >=0.1 && < 0.2
, typed-protocols ^>=0.1.1
, typed-protocols-cborg
^>=0.1
, Win32-network ^>=0.1
Expand Down
Loading
Loading