diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-06-28 08:30:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 08:30:43 +0200 |
| commit | 4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa (patch) | |
| tree | 48cd125daa2a994eba8f4556ea6736de54224bac /pkgs/development/go-modules | |
| parent | 54ae4bde46d0ebeda07c3293febb520d236b59da (diff) | |
| parent | 9d09650cef6cf183500d3e4c8ae0356fa0e878e4 (diff) | |
| download | nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.tar nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.tar.gz nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.tar.bz2 nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.tar.lz nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.tar.xz nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.tar.zst nixpkgs-4f8a04f18062f36a4bbf3cbeb5c7e12bfa8bf1fa.zip | |
Merge pull request #173702 from bdd/go-checkFlags
go-modules/packages: Run unit tests under subdirs
Diffstat (limited to 'pkgs/development/go-modules')
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index b0c587ea471..7e9a76dbde6 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -178,12 +178,22 @@ let exclude+='\)' buildGoDir() { - local d; local cmd; - cmd="$1" - d="$2" + local cmd="$1" dir="$2" + . $TMPDIR/buildFlagsArray + + declare -a flags + flags+=($buildFlags "''${buildFlagsArray[@]}") + flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}}) + flags+=(''${ldflags:+-ldflags="$ldflags"}) + flags+=("-v" "-p" "$NIX_BUILD_CORES") + + if [ "$cmd" = "test" ]; then + flags+=($checkFlags) + fi + local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! OUT="$(go $cmd "''${flags[@]}" $dir 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 @@ -241,7 +251,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test $checkFlags "$pkg" + buildGoDir test "$pkg" done runHook postCheck |