Skip to content

Nightly tests #3665

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Nightly tests #3665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa58411
nix: added nightly to config flags
coot Mar 14, 2022
fd28ef7
ouroboros-network-framework: utf8 characters are not always well supp…
coot Mar 14, 2022
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: 7 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
# }'
, sourcesOverride ? { }
# pinned version of nixpkgs augmented with overlays (iohk-nix and our packages).
, pkgs ? import ./nix { inherit system crossSystem config sourcesOverride; }
, pkgs ? import ./nix { inherit system crossSystem sourcesOverride;
config = { nightly = false; } // config;
}
, gitrev ? pkgs.iohkNix.commitIdFromGitRepoOrZero ./.git }:
with pkgs;
with commonLib;
Expand Down Expand Up @@ -61,6 +63,10 @@ let
haskellPackages.ouroboros-consensus-cardano-test.components.tests.test;
Shelley =
haskellPackages.ouroboros-consensus-shelley-test.components.tests.test;
ouroboros-network-framework =
haskellPackages.ouroboros-network-framework.components.tests.test;
ouroboros-network =
haskellPackages.ouroboros-network.components.tests.test;
};

shell = import ./shell.nix {
Expand Down
5 changes: 4 additions & 1 deletion nix/ouroboros-network.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
{ lib, stdenv, pkgs, haskell-nix, buildPackages, config ? { }
# Enable profiling
, profiling ? config.haskellNix.profiling or false
, libsodium-vrf ? pkgs.libsodium-vrf }:
, libsodium-vrf ? pkgs.libsodium-vrf
}:
let
compiler-nix-name = pkgs.localConfig.ghcVersion;
src = haskell-nix.haskellLib.cleanGit {
Expand Down Expand Up @@ -78,6 +79,7 @@ let
"xhtml"
# "stm" "terminfo"
];
packages.ouroboros-network-testing.flags.nightly = config.nightly;
# ruby/perl dependencies cannot be cross-built for cddl tests:
packages.ouroboros-network.flags.cddl = false;

Expand Down Expand Up @@ -110,6 +112,7 @@ let
# Options for when not compiling to windows:
({ pkgs, ... }:
lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) {
packages.ouroboros-network-testing.flags.nightly = config.nightly;
packages.ouroboros-network.flags.cddl = true;
packages.ouroboros-network.components.tests.cddl.build-tools =
[ pkgs.cddl pkgs.cbor-diag ];
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ instance Show state
=> Show (Transition' state) where
show Transition { fromState, toState } =
concat [ show fromState
, " → "
, " -> "
, show toState
]

Expand Down
2 changes: 1 addition & 1 deletion ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3695,7 +3695,7 @@ splitRemoteConns =

ppTransition :: AbstractTransition -> String
ppTransition Transition {fromState, toState} =
printf "%-30s → %s" (show fromState) (show toState)
printf "%-30s -> %s" (show fromState) (show toState)

ppScript :: (Show peerAddr, Show req) => MultiNodeScript peerAddr req -> String
ppScript (MultiNodeScript script _) = intercalate "\n" $ go 0 script
Expand Down