fix: Avoid iterating over already processed files with gcov

Author: krlmlr

R/compiled.R

@@ -77,22 +77,30 @@ run_gcov <- function(path, quiet = TRUE, clean = TRUE,
     if (length(gcov_inputs)) stop('gcov not found')
     return()
   }
+
+  if (clean) {
+    on.exit({
+      gcov_outputs <- list.files(path, pattern = rex::rex(".gcov", end), recursive = TRUE, full.names = TRUE)
+      unlink(gcov_outputs)
+    })
+  }
+
   run_gcov_one <- function(src) {
     system_check(gcov_path,
       args = c(gcov_args, src, "-p", "-o", dirname(src)),
       quiet = quiet, echo = !quiet)
-    gcov_outputs <- list.files(path, pattern = rex::rex(".gcov", end), recursive = TRUE, full.names = TRUE)
-    if (clean) {
-      on.exit(unlink(gcov_outputs))
-    }
-    unlist(lapply(gcov_outputs, parse_gcov, package_path = c(path, getOption("covr.gcov_additional_paths", NULL))), recursive = FALSE)
   }
 
-  res <- withr::with_dir(src_path, {
-           compact(unlist(lapply(gcov_inputs, run_gcov_one), recursive = FALSE))
-         })
-  if (!length(res) && length(gcov_inputs))
+  withr::with_dir(src_path, {
+    compact(unlist(lapply(gcov_inputs, run_gcov_one), recursive = FALSE))
+    gcov_outputs <- list.files(path, pattern = rex::rex(".gcov", end), recursive = TRUE, full.names = TRUE)
+    res <- unlist(lapply(gcov_outputs, parse_gcov, package_path = c(path, getOption("covr.gcov_additional_paths", NULL))), recursive = FALSE)
+  })
+
+  if (!length(res) && length(gcov_inputs)) {
     warning('parsed gcov output was empty')
+  }
+
   res
 }
 

tests/testthat/test-Compiled.R

@@ -18,15 +18,15 @@ test_that("Compiled code coverage is reported including code in headers", {
   # This header contains a C++ template, which requires you to run gcov for
   # each object file separately and merge the results together.
   simple_h <- cov[cov$filename == "src/simple-header.h", ]
-  expect_equal(simple_h[simple_h$first_line == "12", "value"], 4)
+  expect_equal(simple_h[simple_h$first_line == "12", "value"], 2)
 
-  expect_equal(simple_h[simple_h$first_line == "18", "value"], 3)
+  expect_equal(simple_h[simple_h$first_line == "18", "value"], 1)
 
   expect_equal(simple_h[simple_h$first_line == "21", "value"], 0)
 
   expect_equal(simple_h[simple_h$first_line == "23", "value"], 1)
 
-  expect_equal(simple_h[simple_h$first_line == "25", "value"], 4)
+  expect_equal(simple_h[simple_h$first_line == "25", "value"], 2)
 
   expect_true(all(unique(cov$filename) %in% c("R/TestCompiled.R", "src/simple-header.h", "src/simple.cc", "src/simple4.cc")))
 })