WIP

jesseduffield · Nov 29, 2023 · 8873105 · 8873105
1 parent fb3f7ce
commit 8873105
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
@@ -18,18 +18,17 @@ if [ -n "$GOCOVERDIR" ]; then
   # test runner's coverage data to /tmp/code_coverage_test_runner, then merge the two coverage files
   # back into /tmp/code_coverage
 
-  mkdir -p /tmp/code_coverage_test_runner
+
   mkdir -p /tmp/code_coverage_merged
 
-  go test -cover -coverpkg=github.com/jesseduffield/lazygit/pkg/... pkg/integration/clients/*.go -args -test.gocoverdir="/tmp/code_coverage_test_runner"
+  go test -cover -coverpkg=github.com/jesseduffield/lazygit/pkg/... pkg/integration/clients/*.go -args -test.gocoverdir="/tmp/code_coverage"
 
   echo "contents of /tmp/code_coverage before merge:"
   ls /tmp/code_coverage
 
-  echo "contents of /tmp/code_coverage_test_runner before merge:"
-  ls /tmp/code_coverage_test_runner
 
-  go tool covdata merge -i=/tmp/code_coverage,/tmp/code_coverage_test_runner -o=/tmp/code_coverage_merged
+
+  go tool covdata merge -i=/tmp/code_coverage -o=/tmp/code_coverage_merged
 
   rm -rf /tmp/code_coverage
   mv /tmp/code_coverage_merged /tmp/code_coverage