lcov: Fix capture for package files containing graph files

Depending on whether package files contain graph files, data should be
collected from the unpacked package file directly, or from the build
directory after linking data files. This approach fixes problems when
capturing coverage data via a package from a directory containing graph
files.

Signed-off-by: Peter Oberparleiter <[email protected]>

Author: oberpar

bin/lcov

@@ -1363,6 +1363,35 @@ sub link_data($$$)
 	}
 }
 
+#
+# find_graph_cb(datadir, rel, count_ref)
+#
+# Count number of files found.
+#
+
+sub find_graph_cb($$$)
+{
+	my ($dir, $rel, $count_ref) = @_;
+
+	($$count_ref)++;
+}
+
+#
+# find_graph(dir)
+#
+# Search DIR for a graph file. Return non-zero if one was found, zero otherwise.
+#
+
+sub find_graph($)
+{
+	my ($dir) = @_;
+	my $count = 0;
+
+	lcov_find($dir, \&find_graph_cb, \$count, '\.gcno$', '\.bb$', '\.bbg$');
+
+	return $count > 0 ? 1 : 0;
+}
+
 #
 # package_capture()
 #
@@ -1398,9 +1427,16 @@ sub package_capture()
 	} else {
 		# Build directory needs to be passed to geninfo
 		$base_directory = $build;
-		link_data($dir, $base_directory, 1);
-		lcov_geninfo($base_directory);
-		link_data($dir, $base_directory, 0);
+		if (find_graph($dir)) {
+			# Package contains graph files - collect from there
+			lcov_geninfo($dir);
+		} else {
+			# No graph files found, link data files next to
+			# graph files
+			link_data($dir, $base_directory, 1);
+			lcov_geninfo($base_directory);
+			link_data($dir, $base_directory, 0);
+		}
 	}
 }