tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

lib/tests: Fix after treewide reformat

The test checks against line numbers, which changed with 776b0b45a36ec8e9bcae8e8e93085dac5d8b5a3c.

This is effectively a partial backport of 8f425c25adc365ccddab932cae96cdbed96c115b

Silvan Mosberger 1422b32d 213ba672

options
unified split
Changed files
+5 -5
lib
tests
modules.sh
+5 -5
lib/tests/modules.sh
··· 497 497 498 498 # Declaration positions 499 499 # Line should be present for direct options 500 - checkConfigOutput '^10$' options.imported.line10.declarationPositions.0.line ./declaration-positions.nix 500 + checkConfigOutput '^14$' options.imported.line10.declarationPositions.0.line ./declaration-positions.nix 501 501 checkConfigOutput '/declaration-positions.nix"$' options.imported.line10.declarationPositions.0.file ./declaration-positions.nix 502 502 # Generated options may not have line numbers but they will at least get the 503 503 # right file 504 504 checkConfigOutput '/declaration-positions.nix"$' options.generated.line18.declarationPositions.0.file ./declaration-positions.nix 505 505 checkConfigOutput '^null$' options.generated.line18.declarationPositions.0.line ./declaration-positions.nix 506 506 # Submodules don't break it 507 - checkConfigOutput '^39$' config.submoduleLine34.submodDeclLine39.0.line ./declaration-positions.nix 507 + checkConfigOutput '^45$' config.submoduleLine34.submodDeclLine39.0.line ./declaration-positions.nix 508 508 checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine34.submodDeclLine39.0.file ./declaration-positions.nix 509 509 # New options under freeform submodules get collected into the parent submodule 510 510 # (consistent with .declarations behaviour, but weird; notably appears in system.build) 511 - checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.0.line ./declaration-positions.nix 512 - checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.1.line ./declaration-positions.nix 511 + checkConfigOutput '^38|27$' options.submoduleLine34.declarationPositions.0.line ./declaration-positions.nix 512 + checkConfigOutput '^38|27$' options.submoduleLine34.declarationPositions.1.line ./declaration-positions.nix 513 513 # nested options work 514 - checkConfigOutput '^30$' options.nested.nestedLine30.declarationPositions.0.line ./declaration-positions.nix 514 + checkConfigOutput '^34$' options.nested.nestedLine30.declarationPositions.0.line ./declaration-positions.nix 515 515 516 516 cat <<EOF 517 517 ====== module tests ======