From 02066a4bab3f534569c61f571c25d519a1a569ad Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 19 Jul 2020 17:46:42 +0100 Subject: chore(3p/nix): Enable clang-format check in derivation build This is the easiest way to get the checks up and running for now, but we will probably want to separate out things like this into a separate build step in the future. Change-Id: I8e1a1095aef09b1eee97abad5b6240bc64d14b8c Reviewed-on: https://cl.tvl.fyi/c/depot/+/1287 Tested-by: BuildkiteCI Reviewed-by: glittershark --- third_party/nix/default.nix | 7 ++++++- third_party/nix/src/tests/value-to-json.cc | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'third_party/nix') diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index cceb6b4f1bd5..1ab729e43af5 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -37,9 +37,9 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { bison clang-tools cmake - pkgconfig libxml2 libxslt + pkgconfig (import ./clangd.nix pkgs) ]; @@ -67,6 +67,7 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { doInstallCheck = true; installCheckInputs = with pkgs; [ + fd gtest rapidcheck ]; @@ -91,6 +92,10 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { export NIX_DATA_DIR=$out/share export NIX_TEST_VAR=foo # this is required by a language test make test + + # Ensure formatting is coherent, but do this after the rest of the + # tests run so that developers get all the useful feedback + fd . $src -e hh -e cc | xargs clang-format --dry-run --Werror ''; preBuild = '' diff --git a/third_party/nix/src/tests/value-to-json.cc b/third_party/nix/src/tests/value-to-json.cc index fddeae512b69..573eb658285d 100644 --- a/third_party/nix/src/tests/value-to-json.cc +++ b/third_party/nix/src/tests/value-to-json.cc @@ -8,7 +8,6 @@ #include "libexpr/value-to-xml.hh" #include "libexpr/value.hh" #include "libstore/store-api.hh" - #include "tests/dummy-store.hh" class ValueTest : public ::testing::Test { -- cgit 1.4.1