Enable comma-separated callback parameters as well ass gcov-tool spec.

Can simplify user's Jenkins scripts.

Signed-off-by: Henry Cox <[email protected]>

Author: henry2cox

bin/geninfo

@@ -323,6 +323,8 @@ if (0 == scalar(@gcov_tool)) {
     # not specified - use gcov by default - expected to be in user's path
     push(@gcov_tool, 'gcov');
 } else {
+    @gcov_tool =
+        split($lcovutil::split_char, join($lcovutil::split_char, @gcov_tool));
     my $tool = $gcov_tool[0];
     my (undef, $dir, $file) = splitpath($tool);
 

lib/lcovutil.pm

@@ -864,7 +864,8 @@ sub do_mangle_check
 
 sub configure_callback
 {
-    my $script = $_[0];
+    my @args   = split($lcovutil::split_char, join($lcovutil::split_char, @_));
+    my $script = $args[0];
     my $rtn;
     if ($script =~ /\.pm$/) {
         my $dir     = File::Basename::dirname($script);
@@ -876,7 +877,7 @@ sub configure_callback
             require $package;
             #$package->import(qw(new));
             # the first value in @_ is the script name
-            $rtn = $class->new(@_);
+            $rtn = $class->new(@args);
         };
         if ($@ ||
             !defined($rtn)) {
@@ -887,7 +888,7 @@ sub configure_callback
         shift(@INC);
     } else {
         # not module
-        $rtn = ScriptCaller->new(@_);
+        $rtn = ScriptCaller->new(@args);
     }
     return $rtn;
 }

man/genhtml.1

@@ -532,25 +532,20 @@ if the source file is not found by the callback.
 .RE
 
 .IP 2. 3
-If an option is specified only once, the argument specifies the full command
-line that
-.B genhtml
-passes to a shell interpreter to run the script.
+The option may be specified as a
+.I split_char
+separated string (see
+.B man lcovrc(5)
+) - which is divied into words.  The resulting command line is passed
+to a shell interpreter to run the script.
 This includes the script path followed by optional additional parameters
 separated by spaces. Care must be taken to provide proper quoting if script
 path or any parameter contains spaces or shell special characters.
-.br
-If your callback command contains spaces which are not option separator, then
-the callback and arguments must be specified as described in
-.B 3.,
-below.
 .PP
 
 .IP 3. 3
-If an option is specified multiple times, the first invocation specifies the
-script path and any further invocation specifies one additional parameter.
-In this case, genhtml takes care of quoting of spaces contained in
-script location and additional parameters.
+If an option is specified multiple times, all of the parameters are
+split as described above, then concatentated to form the command line.
 .br
 .PP
 
@@ -576,7 +571,13 @@ results in the same callback as
 genhtml --annotate-script "/bin/script.sh full" ...
 .br
 
-Note that the former is preferred.
+or
+
+.br
+genhtml --annotate-script /bin/script.sh,full ...
+.br
+
+Note that the first form is preferred.
 
 .RE
 
@@ -599,10 +600,17 @@ genhtml --annotate-script
 .br
         --annotate-script "full" ...
 .br
+
+or
+.br
+genhtml --annotate-script
+.I /bin/myMoodule.pm,full
+.br
+
 .br
 .RE
 
-results in
+result in
 .B genhtml
 executing
 .br

man/geninfo.1

@@ -584,11 +584,20 @@ In that case, your callback will be executed as:
 Note that the second and subsequent arguments are quoted when passed to
 the shell, in order to handle parameters which contain spaces.
 
+The
+.B \-\-gcov\-tool
+argument may be a
+.I split_char
+separated string - see
+.B man(4) lcovrc.
+
 A common use for this option is to enable LLVM:
 .br
 
 .RS
 .BR "geninfo \-\-gcov-tool " "llvm-cov " "\-\-gcov-tool " "gcov ..."
+.br
+.BR "geninfo \-\-gcov-tool " "llvm-cov,gcov ..."
 .RE
 .br
 

tests/gendiffcov/errs/msgtest.sh

@@ -110,6 +110,8 @@ else
 fi
 GET_VERSION=$SCRIPTS_DIR/getp4version
 SELECT_SCRIPT=$SCRIPTS_DIR/select.pm
+CRITERIA_SCRIPT=$SCRIPTS_DIR/criteria.pm
+ANNOTATE_SCRIPT=$SCRIPTS_DIR/p4annotate.pm
 
 
 # filter out the compiler-generated _GLOBAL__sub_... symbol
@@ -313,6 +315,27 @@ if [ 0 != $? ] ; then
     fi
 fi
 
+for arg in "--select-script $SELECT_SCRIPT" \
+               "--criteria-script $CRITERIA_SCRIPT" \
+               "--annotate-script $ANNOTATE_SCRIPT" \
+           ; do
+    echo genhtml $DIFCOV_OPTS initial.info -o scriptErr ${arg},-x
+    $COVER $GENHTML_TOOL $DIFFCOV_OPTS initial.info -o scriptErr ${arg},-x 2>&1 | tee script_err.log
+    if [ 0 == ${PIPESTATUS[0]} ] ; then
+        echo "ERROR: genhtml scriptErr passed by accident"
+        if [ 0 == $KEEP_GOING ] ; then
+            exit 1
+        fi
+    fi
+    grep "unable to create callback from" script_err.log
+    if [ 0 != $? ] ; then
+        echo "ERROR: missing script message"
+        if [ 0 == $KEEP_GOING ] ; then
+            exit 1
+        fi
+    fi
+done
+
 echo genhtml $DIFCOV_OPTS initial.info -o select --select-script ./select.sh --rc compute_file_version=1
 $COVER $GENHTML_TOOL $DIFFCOV_OPTS initial.info -o select --select-script ./select.sh  --rc compute_file_version=1 2>&1 | tee select_scr.log
 if [ 0 != ${PIPESTATUS[0]} ] ; then