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 <grfn@gws.fyi>
This commit is contained in:
parent
61a7b97c39
commit
02066a4bab
3 changed files with 7 additions and 2 deletions
1
third_party/default.nix
vendored
1
third_party/default.nix
vendored
|
@ -65,6 +65,7 @@ let
|
|||
diffutils
|
||||
dockerTools
|
||||
execline
|
||||
fd
|
||||
fetchFromGitHub
|
||||
fetchgit
|
||||
fetchurl
|
||||
|
|
7
third_party/nix/default.nix
vendored
7
third_party/nix/default.nix
vendored
|
@ -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 = ''
|
||||
|
|
1
third_party/nix/src/tests/value-to-json.cc
vendored
1
third_party/nix/src/tests/value-to-json.cc
vendored
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue