Improved spdk gerrit ux

build_scripts/build_spdk.sh

@@ -69,6 +69,7 @@ Options:
     --with-fio <FIO>            Use given FIO path
     --without-fio               Build without FIO
     --with-fio-dst <PATH>       FIO install destination
+    --with-unit-tests           Enables the unit tests
     --log <no|tee*|silent>      Output logging options
     --no-log                    Same as "--log no"
     -n, --dry-run               Dry run
@@ -247,6 +248,11 @@ function detect_fio() {
     #fi
 }
 
+function rm_configure_arg() {
+    arg="$1"
+    CONFIGURE_ARGS=($(printf "%s\n" "${CONFIGURE_ARGS[@]}" | grep -v "^$arg$"))
+}
+
 function cmd_configure() {
     #
     # Making configure options.
@@ -513,6 +519,10 @@ do
             msg_info "With FIO install destination: $WITH_FIO_DST"
             shift
             ;;
+        "--with-unit-tests")
+            rm_configure_arg "--disable-unit-tests"
+            msg_info "With unit-tests"
+            ;;
         "--log")
             LOG_MODE=$1
             LOG_MODE_EXPLICIT="yes"
@@ -522,7 +532,7 @@ do
             LOG_MODE="no"
             LOG_MODE_EXPLICIT="yes"
             ;;
-        "-n" | "--dry-run")
+        "-n" | "-d" | "--dry-run")
             DRY_RUN="yes"
             msg_info "Dry run is enabled"
             ;;

nix/overlay.nix

@@ -1,6 +1,7 @@
 {}:
 final: prev: rec {
   fio = prev.callPackage ./pkgs/fio { };
+  astyle = prev.callPackage ./pkgs/astyle { };
   libnvme = prev.callPackage ./pkgs/libnvme { };
   nvme-cli = prev.callPackage ./pkgs/nvme-cli { };
   libspdk = prev.callPackage ./pkgs/libspdk { with-fio = false; build-type = "release"; };

nix/pkgs/astyle/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+
+let
+  name = "astyle";
+  version = "3.1";
+in
+stdenv.mkDerivation {
+  name = "${name}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz";
+    sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b";
+  };
+
+  sourceRoot =
+    if stdenv.cc.isClang
+    then "astyle/build/clang"
+    else "astyle/build/gcc";
+
+  # -s option is obsolete on Darwin and breaks build
+  postPatch =
+    if stdenv.isDarwin then ''
+      substituteInPlace Makefile --replace "LDFLAGSr   = -s" "LDFLAGSr ="
+    '' else null;
+
+  installFlags = "INSTALL=install prefix=$$out";
+
+  meta = {
+    homepage = http://astyle.sourceforge.net/;
+    description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
+  };
+}

nix/pkgs/libspdk/default.nix

@@ -45,6 +45,7 @@
 , zlib
 , rdma-core
 , keyutils
+, astyle
 }:
 let
   # Suffix for debug build name.
@@ -111,6 +112,8 @@ let
 
     sourceRoot = spdk.name;
 
+    devBuildInputs = [ astyle pkgs.python3Packages.tabulate pkgs.python3Packages.jinja2 ];
+
     nativeBuildInputs = [
       cmake
       gcc

nix/shell/spdk.nix

@@ -76,7 +76,7 @@ let
     none = {
       drv = null;
 
-      buildInputs = with pkgs; libspdk-dev.nativeBuildInputs ++ libspdk-dev.buildInputs;
+      buildInputs = with pkgs; libspdk-dev.nativeBuildInputs ++ libspdk-dev.buildInputs ++ libspdk-dev.devBuildInputs;
 
       shellEnv = {
         CFLAGS = cflagsValue;