[Git][ghc/ghc][wip/hadrian-ghc-llvm-version] TEMP more verbose

[John Ericson (@Ericson2314)]

John Ericson pushed to branch wip/hadrian-ghc-llvm-version at Glasgow Haskell Compiler / GHC


Commits:
365d7328 by John Ericson at 2023-10-22T11:20:47-04:00
TEMP more verbose

Include Revert "hadrian: Decrease verbosity of cabal commands"

This reverts commit 9e6ef7ba5949b8900b3a7efb3a443c2004ebe184.

- - - - -


4 changed files:

- .gitlab-ci.yml
- hadrian/ghci-cabal.in
- hadrian/ghci-multi-cabal.in
- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -400,7 +400,7 @@ hadrian-ghc-in-ghci:
     - "echo 'package hadrian'  > hadrian/cabal.project.local"
     - "echo '  ghc-options: -Werror'  >> hadrian/cabal.project.local"
     # Load ghc-in-ghci then immediately exit and check the modules loaded
-    - echo ":q" | hadrian/ghci -j`mk/detect-cpu-count.sh`| tail -n2 | grep "Ok,"
+    - echo ":q" | hadrian/ghci -j`mk/detect-cpu-count.sh`
   after_script:
     - .gitlab/ci.sh save_cache
     - cat ci-timings
@@ -452,7 +452,7 @@ hadrian-multi:
     # Now GHC means, use this GHC for hadrian
     - export GHC=$BOOT_HC
     # Load hadrian-multi then immediately exit and check the modules loaded
-    - echo ":q" | hadrian/ghci-multi -j`mk/detect-cpu-count.sh`| tail -n2 | grep "Ok,"
+    - echo ":q" | hadrian/ghci-multi -j`mk/detect-cpu-count.sh`
   after_script:
     - .gitlab/ci.sh save_cache
   cache:


=====================================
hadrian/ghci-cabal.in
=====================================
@@ -5,6 +5,6 @@
 set -e
 export TOOL_OUTPUT=.hadrian_ghci/ghci_args
 # Replace newlines with spaces, as these otherwise break the ghci invocation on windows.
-CABFLAGS="-v0 $CABFLAGS" "hadrian/build-cabal" tool:compiler/GHC.hs --build-root=.hadrian_ghci --flavour=ghc-in-ghci $HADRIAN_ARGS
+"hadrian/build-cabal" tool:compiler/GHC.hs --build-root=.hadrian_ghci --flavour=ghc-in-ghci $HADRIAN_ARGS
 GHC_FLAGS="$GHC_FLAGS $(cat $TOOL_OUTPUT | tr '\n\r' ' ')"
 @WithGhc@ --interactive $GHC_FLAGS $@ -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 +RTS -A128m


=====================================
hadrian/ghci-multi-cabal.in
=====================================
@@ -8,6 +8,6 @@ if [[ $(printf "9.4.0\n%s\n" $($RUN_GHC --numeric-version) | sort -uV | head -n
 set -e
 export TOOL_OUTPUT=.hadrian_ghci_multi/ghci_args
 # Replace newlines with spaces, as these otherwise break the ghci invocation on windows.
-CABFLAGS=-v0 "hadrian/build-cabal" multi:ghc --build-root=.hadrian_ghci_multi --flavour=ghc-in-ghci $HADRIAN_ARGS
+"hadrian/build-cabal" multi:ghc --build-root=.hadrian_ghci_multi --flavour=ghc-in-ghci $HADRIAN_ARGS
 GHC_FLAGS="$GHC_FLAGS $(cat $TOOL_OUTPUT | tr '\n\r' ' ')"
 $RUN_GHC --interactive $GHC_FLAGS $@ -fno-code -fwrite-interface -O0 +RTS -A128m


=====================================
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
=====================================
@@ -198,10 +198,9 @@ copyPackage context at Context {..} = do
 shakeVerbosityToCabalFlag :: Verbosity -> String
 shakeVerbosityToCabalFlag = \case
     Diagnostic -> "-v3"
-    Verbose -> "-v2"
-    -- Normal levels should not produce output to stdout
+    Verbose -> "-v3"
     Silent -> "-v0"
-    _ -> "-v1"
+    _ -> "-v2"
 
 -- | What type of file is Main
 data MainSourceType = HsMain | CppMain | CMain



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/365d73281646deeabf83ee509f47accc84ac8b80

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/365d73281646deeabf83ee509f47accc84ac8b80
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231022/66be05e9/attachment-0001.html>