llvm*: Don't show progress bar on tests

Since the progress bar results in large output that is broken due to the use of ncurses and we already use the flag that gives verbose output on test failures, let's just disable the progress bar.
2022-09-03 17:14:18 +02:00 · 2022-09-03 17:14:18 +02:00 · bd332c848c
commit bd332c848c
parent 6c6f4a9724
11 changed files with 77 additions and 11 deletions
--- a/pkgs/development/compilers/llvm/10/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/10/llvm/default.nix
@ -151,6 +151,13 @@ in stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -179,7 +186,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals enableManpages [
    "-DLLVM_BUILD_DOCS=ON"
    "-DLLVM_ENABLE_SPHINX=ON"
--- a/pkgs/development/compilers/llvm/11/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/11/llvm/default.nix
@ -150,6 +150,13 @@ in stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -181,7 +188,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals stdenv.hostPlatform.isStatic [
    # Disables building of shared libs, -fPIC is still injected by cc-wrapper
    "-DLLVM_ENABLE_PIC=OFF"
--- a/pkgs/development/compilers/llvm/12/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/12/llvm/default.nix
@ -140,6 +140,13 @@ in stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -171,7 +178,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals stdenv.hostPlatform.isStatic [
    # Disables building of shared libs, -fPIC is still injected by cc-wrapper
    "-DLLVM_ENABLE_PIC=OFF"
--- a/pkgs/development/compilers/llvm/13/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/13/llvm/default.nix
@ -102,6 +102,13 @@ in stdenv.mkDerivation (rec {
    patchShebangs test/BugPoint/compile-custom.ll.py
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -133,7 +140,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals stdenv.hostPlatform.isStatic [
    # Disables building of shared libs, -fPIC is still injected by cc-wrapper
    "-DLLVM_ENABLE_PIC=OFF"
--- a/pkgs/development/compilers/llvm/14/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/14/llvm/default.nix
@ -113,6 +113,13 @@ in stdenv.mkDerivation (rec {
    patchShebangs test/BugPoint/compile-custom.ll.py
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -144,7 +151,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals stdenv.hostPlatform.isStatic [
    # Disables building of shared libs, -fPIC is still injected by cc-wrapper
    "-DLLVM_ENABLE_PIC=OFF"
--- a/pkgs/development/compilers/llvm/5/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/5/llvm/default.nix
@ -125,6 +125,13 @@ stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -154,7 +161,6 @@ stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ]
  ++ lib.optionals enableManpages [
    "-DLLVM_BUILD_DOCS=ON"
--- a/pkgs/development/compilers/llvm/6/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/6/llvm/default.nix
@ -120,6 +120,13 @@ stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -149,7 +156,6 @@ stdenv.mkDerivation (rec {
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals enableManpages [
    "-DLLVM_BUILD_DOCS=ON"
    "-DLLVM_ENABLE_SPHINX=ON"
--- a/pkgs/development/compilers/llvm/7/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/7/llvm/default.nix
@ -139,6 +139,13 @@ in stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -168,7 +175,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals enableManpages [
    "-DLLVM_BUILD_DOCS=ON"
    "-DLLVM_ENABLE_SPHINX=ON"
--- a/pkgs/development/compilers/llvm/8/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/8/llvm/default.nix
@ -133,6 +133,13 @@ in stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -161,7 +168,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals enableManpages [
    "-DLLVM_BUILD_DOCS=ON"
    "-DLLVM_ENABLE_SPHINX=ON"
--- a/pkgs/development/compilers/llvm/9/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/9/llvm/default.nix
@ -148,6 +148,13 @@ in stdenv.mkDerivation (rec {
    done
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -176,7 +183,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals enableManpages [
    "-DLLVM_BUILD_DOCS=ON"
    "-DLLVM_ENABLE_SPHINX=ON"
--- a/pkgs/development/compilers/llvm/git/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/git/llvm/default.nix
@ -99,6 +99,13 @@ in stdenv.mkDerivation (rec {
    patchShebangs test/BugPoint/compile-custom.ll.py
  '';

+  preConfigure = ''
+    # Workaround for configure flags that need to have spaces
+    cmakeFlagsArray+=(
+      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+    )
+  '';
+
  # hacky fix: created binaries need to be run before installation
  preBuild = ''
    mkdir -p $out/
@ -130,7 +137,6 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_ENABLE_DUMP=ON"
-    "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}"
  ] ++ optionals stdenv.hostPlatform.isStatic [
    # Disables building of shared libs, -fPIC is still injected by cc-wrapper
    "-DLLVM_ENABLE_PIC=OFF"