diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/pkgs-lib/tests | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/pkgs-lib/tests')
| -rw-r--r-- | nixpkgs/pkgs/pkgs-lib/tests/formats.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/nixpkgs/pkgs/pkgs-lib/tests/formats.nix index bf6be8595e1b..16b760a5ada1 100644 --- a/nixpkgs/pkgs/pkgs-lib/tests/formats.nix +++ b/nixpkgs/pkgs/pkgs-lib/tests/formats.nix @@ -15,11 +15,11 @@ let in formatSet.generate "test-format-file" config; runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' - if diff ${drv} ${builtins.toFile "expected" expected}; then - touch $out + if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then + touch "$out" else - echo "Got: $(cat ${drv})" - echo "Should be: ${expected}" + echo + echo "Got different values than expected; diff above." exit 1 fi ''; @@ -147,9 +147,7 @@ in runBuildTests { foo = "foo" [level1] - [level1.level2] - [level1.level2.level3] level4 = "deep" ''; |