From 094e933e9a2b6aa4d1a3e56642febe4ba9dc6355 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Fri, 4 Aug 2023 09:50:05 +0200 Subject: [PATCH] Github Actions: execute tests with -N flag --- .github/workflows/build.yml | 12 ++++++------ ntp-client/ntp-client.cabal | 1 + .../ouroboros-network-protocols.cabal | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7a55ebaf7a..a8b9a141a5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,26 +102,26 @@ jobs: # Test network packages - name: ntp-client [test] - run: cabal run ntp-client:test + run: cabal run ntp-client:test -- +RTS -N -RTS - name: network-mux [test] - run: cabal run network-mux:test + run: cabal run network-mux:test -- +RTS -N -RTS - name: ourobors-network-testing [test] - run: cabal run ouroboros-network-testing:test + run: cabal run ouroboros-network-testing:test -- +RTS -N -RTS - name: ourobors-network-framework [test] - run: cabal run ouroboros-network-framework:test + run: cabal run ouroboros-network-framework:test -- +RTS -N -RTS - name: ouroboros-network-protocols [test] - run: cabal run ouroboros-network-protocols:test + run: cabal run ouroboros-network-protocols:test -- +RTS -N -RTS # We don't run cddl in GitHub actions (only on Hydra). # - name: ouroboros-network-protocols [cddl] # run: cabal run ouroboros-network-protocols-test:cddl - name: ouroboros-network [test] - run: cabal run ouroboros-network:test + run: cabal run ouroboros-network:test -- +RTS -N -RTS # Uncomment the following back in for debugging. Remember to launch a `pwsh` from # the tmux session to debug `pwsh` issues. And be reminded that the `/msys2` and diff --git a/ntp-client/ntp-client.cabal b/ntp-client/ntp-client.cabal index 94eaccad890..03898fbabcf 100644 --- a/ntp-client/ntp-client.cabal +++ b/ntp-client/ntp-client.cabal @@ -59,6 +59,7 @@ test-suite test default-language: Haskell2010 ghc-options: -Wall -Wunused-packages + -threaded executable demo-ntp-client hs-source-dirs: demo diff --git a/ouroboros-network-protocols/ouroboros-network-protocols.cabal b/ouroboros-network-protocols/ouroboros-network-protocols.cabal index a7a3c661c1d..cec7cc38959 100644 --- a/ouroboros-network-protocols/ouroboros-network-protocols.cabal +++ b/ouroboros-network-protocols/ouroboros-network-protocols.cabal @@ -205,7 +205,8 @@ test-suite test ouroboros-network-protocols:testlib, ouroboros-network-testing ^>= 0.3 - ghc-options: -Wall + ghc-options: -threaded + -Wall -Wunused-packages test-suite cddl @@ -243,7 +244,8 @@ test-suite cddl ouroboros-network-protocols, ouroboros-network-protocols:testlib - ghc-options: -Wall + ghc-options: -threaded + -Wall -Wno-unticked-promoted-constructors -Wcompat -Wunused-packages