WIP 2

Author: sevanspowell

lib/cover.nix

@@ -12,82 +12,103 @@ let
 
   identifier = name + "-" + version;
 
+  toBashArray = arr: "(" + (lib.concatStringsSep " " arr) + ")";
+
 in pkgs.runCommand (identifier + "-coverage-report")
   { buildInputs = (with pkgs; [ ghc ]); }
   ''
-    findMixDir() {
-      find $1 -iwholename "*/hpc/vanilla/mix" -exec find {} -maxdepth 1 -type d -iwholename "*/mix/*" \; -quit
+    function markup() {
+      local srcDir=$1
+      local -n mixDs=$2
+      local -n excludedModules=$3
+      local destDir=$4
+      local tixFile=$5
+
+      local hpcMarkupCmd=("hpc" "markup" "--srcdir=$srcDir" "--destdir=$destDir")
+      for mixDir in "''${mixDs[@]}"; do
+        hpcMarkupCmd+=("--hpcdir=$mixDir")
+      done
+
+      for module in "''${excludedModules[@]}"; do
+        hpcMarkupCmd+=("--exclude=$module")
+      done
+
+      hpcMarkupCmd+=("$tixFile")
+
+      echo "''${hpcMarkupCmd[@]}"
+      eval "''${hpcMarkupCmd[@]}"
+    }
+
+    function sumTix() {
+      local -n excludedModules=$1
+      local -n tixFs=$2
+      local outFile="$3"
+
+      echo "EXCLUDED ''${excludedModules[@]}"
+      echo "EXCLUDED ''${tixFs[@]}"
+      local hpcSumCmd=("hpc" "sum" "--union" "--output=$outFile")
+
+      for module in "''${excludedModules[@]}"; do
+        hpcSumCmd+=("--exclude=$module")
+      done
+
+      for tixFile in "''${tixFs[@]}"; do
+        hpcSumCmd+=("$tixFile")
+      done
+
+      echo "''${hpcSumCmd[@]}"
+      eval "''${hpcSumCmd[@]}"
     }
 
     mkdir -p $out/share/hpc/vanilla/mix/${identifier}
     mkdir -p $out/share/hpc/vanilla/tix/${identifier}
     mkdir -p $out/share/hpc/vanilla/html/${identifier}
 
     local src=${library.src.outPath}
-
-    hpcMarkupCmdBase=("hpc" "markup" "--srcdir=$src")
-    for drv in ${lib.concatStringsSep " " ([ library ] ++ testsAsList)}; do
-      # Copy over mix files
-      local mixDir=$(findMixDir $drv)
+    local mixDirs=${toBashArray (map (drv: "${drv}/share/hpc/vanilla/mix") ([library] ++ testsAsList))}
+    # Exclude test modules from tix file. The Main module is
+    # hard-coded here because the Main module is not listed in
+    # "$test.config.modules" (the plan.nix) but must be excluded.
+    # Note that the name of the Main module file does not matter. So
+    # a line in your cabal file such as:
+    #   main-is: Spec.hs
+    # still generates a "Main.mix" file with the contents:
+    #   Mix "Spec.hs" ...
+    # Hence we can hardcode the name "Main" here.
+    local testModules=${toBashArray (["Main"] ++ (lib.foldl' (acc: test: acc ++ test.config.modules) [] testsAsList))}
+    local totalTixFile="$out/share/hpc/vanilla/tix/${identifier}/${identifier}.tix"
+    local markupOutDir="$out/share/hpc/vanilla/html/${identifier}"
+
+    echo "''${testModules[@]}"
+
+    # Copy over mix files verbatim
+    for dir in $mixDirs; do
       if [ ! -z "$mixDir" ]; then
         cp -R "$mixDir" $out/share/hpc/vanilla/mix/
-
-        hpcMarkupCmdBase+=("--hpcdir=$mixDir")
       fi
     done
 
     ${lib.optionalString ((builtins.length testsAsList) > 0) ''
-      # Exclude test modules from tix file. The Main module is
-      # hard-coded here because the Main module is not listed in
-      # "$test.config.modules" (the plan.nix) but must be excluded.
-      # Note that the name of the Main module file does not matter. So
-      # a line in your cabal file such as:
-      #   main-is: Spec.hs
-      # still generates a "Main.mix" file with the contents:
-      #   Mix "Spec.hs" ...
-      # Hence we can hardcode the name "Main" here.
-      excludedModules=('Main')
-      testModules="${with lib; concatStringsSep " " (foldl' (acc: test: acc ++ test.config.modules) [] testsAsList)}"
-      for module in $testModules; do
-        excludedModules+=("$module")
-      done
-
-      hpcSumCmdBase=("hpc" "sum" "--union" "--output=$out/share/hpc/vanilla/tix/${identifier}/${identifier}.tix")
-      for exclude in ''${excludedModules[@]}; do
-        hpcSumCmdBase+=("--exclude=$exclude")
-        hpcMarkupCmdBase+=("--exclude=$exclude")
-      done
-
-      hpcMarkupCmdAll=("''${hpcMarkupCmdBase[@]}" "--destdir=$out/share/hpc/vanilla/html/${identifier}")
-
-      hpcSumCmd=()
+      local tixFiles=()
       ${lib.concatStringsSep "\n" (builtins.map (check: ''
         if [ -d "${check}/share/hpc/vanilla/tix" ]; then
           pushd ${check}/share/hpc/vanilla/tix
 
-          tixFileRel="$(find . -iwholename "*.tix" -type f -print -quit)"
+          tixFile="$(find . -iwholename "*.tix" -type f -print -quit)"
 
-          mkdir -p $out/share/hpc/vanilla/tix/$(dirname $tixFileRel)
-          cp $tixFileRel $out/share/hpc/vanilla/tix/$tixFileRel
+          cp "$tixFile" $out/share/hpc/vanilla/tix/
 
-          # Output tix file with test modules excluded
-          hpcSumCmd+=("$out/share/hpc/vanilla/tix/$tixFileRel")
+          tixFiles+=("${check}/share/hpc/vanilla/tix/$tixFile")
 
           popd
         fi
       '') checks)
       }
 
-      if (( "''${#hpcSumCmd[@]}" > 0 )); then
-        hpcMarkupCmdAll+=("$out/share/hpc/tix/${identifier}/${identifier}.tix")
-
-        hpcSumCmd=("''${hpcSumCmdBase[@]}" "''${hpcSumCmd[@]}")
-        echo "''${hpcSumCmd[@]}"
-        eval "''${hpcSumCmd[@]}"
-
-        hpcMarkupCmdAll+=("$out/share/hpc/vanilla/tix/${identifier}/${identifier}.tix")
-        echo "''${hpcMarkupCmdAll[@]}"
-        eval "''${hpcMarkupCmdAll[@]}"
+      if (( "''${#tixFiles[@]}" > 0 )); then
+        sumTix testModules tixFiles "$totalTixFile"
+        
+        markup "$src" mixDirs testModules "$markupOutDir" "$totalTixFile"
       fi
     ''}
   ''