Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,17 @@
in
{
dev = { inherit overrideInputs; dir = "dev"; };
test = { inherit overrideInputs; dir = "test"; };
doc = { dir = "doc"; };
example = { inherit overrideInputs; dir = "example"; };

# Tests
haskell-parsers-test = {
overrideInputs."haskell-parsers" = ./nix/haskell-parsers;
dir = ./nix/haskell-parsers/test;
};
# Legacy shell script test
# TODO: Port to pure Nix; see https://github.com/srid/haskell-flake/issues/241
test = { inherit overrideInputs; dir = "test"; };
};
};
}
1 change: 1 addition & 0 deletions nix/haskell-parsers/parser_tests.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Run this using 'nixci' at top-level
{ pkgs ? import <nixpkgs> { }, lib ? pkgs.lib, ... }:

let
Expand Down
4 changes: 0 additions & 4 deletions nix/haskell-parsers/test.sh

This file was deleted.

64 changes: 64 additions & 0 deletions nix/haskell-parsers/test/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions nix/haskell-parsers/test/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
haskell-parsers = { flake = false; }; # Overriden by nixci (see top-level flake.nix)
};
outputs = inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = inputs.nixpkgs.lib.systems.flakeExposed;
perSystem = { pkgs, lib, ... }: {
checks.tests =
let
result = import (inputs.haskell-parsers + /parser_tests.nix) { inherit pkgs lib; };
in
pkgs.writeTextFile {
name = "haskell-parsers-test-results";
text = builtins.toJSON result;
};
};
};
}
2 changes: 1 addition & 1 deletion runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ nix --version

# The test directory must contain a 'test.sh' file that will be run in that
# directory.
# TODO: Supplant these scripts with Nix. See https://github.com/srid/haskell-flake/issues/241
TESTS=(
./nix/haskell-parsers
./example
./test/simple
./test/with-subdir
Expand Down