commit 99dd92d76f4b2a4f9fd09d9fdb3f7f1d7821ad21 · pyrox.dev/nixpkgs

+18

doc/hooks/cmake.section.md

···

       33
       33
        
       #### `dontUseCmakeConfigure` {#dont-use-cmake-configure}

     

       34
       34
        
       

     

       35
       35
        
       When set to true, don't use the predefined `cmakeConfigurePhase`.

     

       36
       36
       +
       

     

       37
       37
       +
       ## Controlling CTest invocation {#cmake-ctest}

     

       38
       38
       +
       

     

       39
       39
       +
       By default tests are run by make in [`checkPhase`](#ssec-check-phase) or by [ninja](#ninja) if `ninja` is

     

       40
       40
       +
       available in `nativeBuildInputs`. Makefile and Ninja generators produce the `test` target, which invokes `ctest` under the hood.

     

       41
       41
       +
       This makes passing additional arguments to `ctest` difficult, so it's possible to invoke it directly in `checkPhase`

     

       42
       42
       +
       by adding `ctestCheckHook` to `nativeCheckInputs`.

     

       43
       43
       +
       

     

       44
       44
       +
       ### CTest Variables {#cmake-ctest-variables}

     

       45
       45
       +
       

     

       46
       46
       +
       #### `disabledTests` {#cmake-ctest-disabled-tests}

     

       47
       47
       +
       

     

       48
       48
       +
       Allows to disable running a list of tests. Note that regular expressions are not supported by `disabledTests`, but

     

       49
       49
       +
       it can be combined with `--exclude-regex` option.

     

       50
       50
       +
       

     

       51
       51
       +
       #### `ctestFlags` {#cmake-ctest-flags}

     

       52
       52
       +
       

     

       53
       53
       +
       Additional options passed to `ctest` together with `checkFlags`.

+12

doc/redirects.json

···

       5
       5
        
         "chap-release-notes": [

     

       6
       6
        
           "release-notes.html#chap-release-notes"

     

       7
       7
        
         ],

     

       8
       8
       +
         "cmake-ctest": [

     

       9
       9
       +
           "index.html#cmake-ctest"

     

       10
       10
       +
         ],

     

       11
       11
       +
         "cmake-ctest-disabled-tests": [

     

       12
       12
       +
           "index.html#cmake-ctest-disabled-tests"

     

       13
       13
       +
         ],

     

       14
       14
       +
         "cmake-ctest-flags": [

     

       15
       15
       +
           "index.html#cmake-ctest-flags"

     

       16
       16
       +
         ],

     

       17
       17
       +
         "cmake-ctest-variables": [

     

       18
       18
       +
           "index.html#cmake-ctest-variables"

     

       19
       19
       +
         ],

     

       8
       20
        
         "ex-build-helpers-extendMkDerivation": [

     

       9
       21
        
           "index.html#ex-build-helpers-extendMkDerivation"

     

       10
       22
        
         ],

+12 -20

pkgs/applications/audio/zynaddsubfx/default.nix

···

       45
       45
        
         # Test dependencies

     

       46
       46
        
         cxxtest,

     

       47
       47
        
         ruby,

     

       48
       48
       +
         ctestCheckHook,

     

       48
       49
        
       }:

     

       49
       50
        
       

     

       50
       51
        
       assert builtins.any (g: guiModule == g) [

     
···

       151
       152
        
         nativeCheckInputs = [

     

       152
       153
        
           cxxtest

     

       153
       154
        
           ruby

     

       155
       155
       +
           ctestCheckHook

     

       154
       156
        
         ];

     

       155
       157
        
       

     

       156
       156
       -
         # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829

     

       157
       157
       -
         checkPhase =

     

       158
       158
       -
           let

     

       159
       159
       -
             disabledTests =

     

       160
       160
       -
               # PortChecker is non-deterministic. It's fixed in the master

     

       161
       161
       -
               # branch, but backporting would require an update to rtosc, so

     

       162
       162
       -
               # we'll just disable it until the next release.

     

       163
       163
       -
               [ "PortChecker" ]

     

       164
       164
       -
       

     

       165
       165
       -
               # Tests fail on aarch64

     

       166
       166
       -
               ++ lib.optionals stdenv.hostPlatform.isAarch64 [

     

       167
       167
       -
                 "MessageTest"

     

       168
       168
       -
                 "UnisonTest"

     

       169
       169
       -
               ];

     

       170
       170
       -
           in

     

       171
       171
       -
           ''

     

       172
       172
       -
             runHook preCheck

     

       173
       173
       -
             ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$'

     

       174
       174
       -
             runHook postCheck

     

       175
       175
       -
           '';

     

       158
       158
       +
         disabledTests =

     

       159
       159
       +
           # PortChecker is non-deterministic. It's fixed in the master

     

       160
       160
       +
           # branch, but backporting would require an update to rtosc, so

     

       161
       161
       +
           # we'll just disable it until the next release.

     

       162
       162
       +
           [ "PortChecker" ]

     

       163
       163
       +
           # Tests fail on aarch64

     

       164
       164
       +
           ++ lib.optionals stdenv.hostPlatform.isAarch64 [

     

       165
       165
       +
             "MessageTest"

     

       166
       166
       +
             "UnisonTest"

     

       167
       167
       +
           ];

     

       176
       168
        
       

     

       177
       169
        
         # Use Zyn-Fusion logo for zest build

     

       178
       170
        
         # An SVG version of the logo isn't hosted anywhere we can fetch, I

+44

pkgs/by-name/ct/ctestCheckHook/ctest-check-hook.sh

···

       1
       1
       +
       # shellcheck shell=bash disable=SC2154

     

       2
       2
       +
       

     

       3
       3
       +
       ctestCheckHook() {

     

       4
       4
       +
           echo "Executing ctestCheckHook"

     

       5
       5
       +
       

     

       6
       6
       +
           runHook preCheck

     

       7
       7
       +
       

     

       8
       8
       +
           local buildCores=1

     

       9
       9
       +
       

     

       10
       10
       +
           if [ "${enableParallelChecking-1}" ]; then

     

       11
       11
       +
               buildCores="$NIX_BUILD_CORES"

     

       12
       12
       +
           fi

     

       13
       13
       +
       

     

       14
       14
       +
           local flagsArray=(

     

       15
       15
       +
               "-j$buildCores"

     

       16
       16
       +
               # This is enabled by the cmakeConfigurePhase by exporting

     

       17
       17
       +
               # CTEST_OUTPUT_ON_FAILURE, but it makes sense it enable it globally here

     

       18
       18
       +
               # as well.

     

       19
       19
       +
               "--output-on-failure"

     

       20
       20
       +
           )

     

       21
       21
       +
       

     

       22
       22
       +
           local disabledTestsArray=()

     

       23
       23
       +
           concatTo disabledTestsArray disabledTests

     

       24
       24
       +
       

     

       25
       25
       +
           if [ ${#disabledTestsArray[@]} -ne 0 ]; then

     

       26
       26
       +
               local ctestExcludedTestsFile=$NIX_BUILD_TOP/.ctest-excluded-tests

     

       27
       27
       +
               disabledTestsString="$(concatStringsSep "\n" disabledTestsArray)"

     

       28
       28
       +
               echo -e "$disabledTestsString" >"$ctestExcludedTestsFile"

     

       29
       29
       +
               flagsArray+=("--exclude-from-file" "$ctestExcludedTestsFile")

     

       30
       30
       +
           fi

     

       31
       31
       +
       

     

       32
       32
       +
           concatTo flagsArray ctestFlags checkFlags checkFlagsArray

     

       33
       33
       +
       

     

       34
       34
       +
           echoCmd 'ctest flags' "${flagsArray[@]}"

     

       35
       35
       +
           ctest "${flagsArray[@]}"

     

       36
       36
       +
       

     

       37
       37
       +
           echo "Finished ctestCheckHook"

     

       38
       38
       +
       

     

       39
       39
       +
           runHook postCheck

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       if [ -z "${dontUseCTestCheck-}" ] && [ -z "${checkPhase-}" ]; then

     

       43
       43
       +
           checkPhase=ctestCheckHook

     

       44
       44
       +
       fi

+9

pkgs/by-name/ct/ctestCheckHook/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         makeSetupHook,

     

       3
       3
       +
         cmake,

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       makeSetupHook {

     

       7
       7
       +
         name = "ctestCheckHook";

     

       8
       8
       +
         propagatedBuildInputs = [ cmake ];

     

       9
       9
       +
       } ./ctest-check-hook.sh

+6 -5

pkgs/by-name/gi/gifticlib/package.nix

···

       6
       6
        
         expat,

     

       7
       7
        
         nifticlib,

     

       8
       8
        
         zlib,

     

       9
       9
       +
         ctestCheckHook,

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       stdenv.mkDerivation {

     
···

       33
       34
        
       

     

       34
       35
        
         # without the test data, this is only a few basic tests

     

       35
       36
        
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       36
       36
       -
         checkPhase = ''

     

       37
       37
       -
           runHook preCheck

     

       38
       38
       -
           ctest -LE 'NEEDS_DATA'

     

       39
       39
       -
           runHook postCheck

     

       40
       40
       -
         '';

     

       37
       37
       +
         nativeCheckInputs = [ ctestCheckHook ];

     

       38
       38
       +
         checkFlags = [

     

       39
       39
       +
           "-LE"

     

       40
       40
       +
           "NEEDS_DATA"

     

       41
       41
       +
         ];

     

       41
       42
        
       

     

       42
       43
        
         meta = with lib; {

     

       43
       44
        
           homepage = "https://www.nitrc.org/projects/gifti";

+5 -8

pkgs/by-name/pd/pdal/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         callPackage,

     

       5
       5
       +
         ctestCheckHook,

     

       5
       6
        
         fetchFromGitHub,

     

       6
       7
        
         testers,

     

       7
       8
        
       

     
···

       92
       93
        
         ];

     

       93
       94
        
       

     

       94
       95
        
         doCheck = true;

     

       96
       96
       +
         # tests are flaky and they seem to fail less often when they don't run in

     

       97
       97
       +
         # parallel

     

       98
       98
       +
         enableParallelChecking = false;

     

       95
       99
        
       

     

       96
       100
        
         disabledTests = [

     

       97
       101
        
           # Tests failing due to TileDB library implementation, disabled also

     
···

       116
       120
        
       

     

       117
       121
        
         nativeCheckInputs = [

     

       118
       122
        
           gdal # gdalinfo

     

       123
       123
       +
           ctestCheckHook

     

       119
       124
        
         ];

     

       120
       120
       -
       

     

       121
       121
       -
         checkPhase = ''

     

       122
       122
       -
           runHook preCheck

     

       123
       123
       -
           # tests are flaky and they seem to fail less often when they don't run in

     

       124
       124
       -
           # parallel

     

       125
       125
       -
           ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'

     

       126
       126
       -
           runHook postCheck

     

       127
       127
       -
         '';

     

       128
       125
        
       

     

       129
       126
        
         postInstall = ''

     

       130
       127
        
           patchShebangs --update --build $out/bin/pdal-config