csmock: apply filters of important reports more precisely

In order not to clobber scan properties, we used to use `csmock
--mode=grep` while feeding csdiff.  This caused spurious matches
of important reports in case csdiff parsed the plain-text output
differently (namely a wrong event was recognized as the key event
in some corner cases).  This commit makes csdiff operate solely
on the JSON format, which tags key events explicitly.

Author: kdudka

make-srpm.sh

@@ -136,7 +136,7 @@ Tool for plugging static analyzers into the build process, free of mock.
 
 %package -n csmock-common
 Summary: Core of csmock (a mock wrapper for Static Analysis tools)
-Requires: csdiff > 1.8.0
+Requires: csdiff > 2.1.0
 Requires: csgcca
 Requires: cswrap >= 1.3.1
 Requires: mock

py/csmock

@@ -507,7 +507,7 @@ def finalize_results(js_file, results, props):
         # then apply custom per-checker filters
         for (chk, csgrep_args) in props.imp_csgrep_filters:
             chk_re = re_from_checker_set(props.imp_checker_set - set([chk]))
-            cmd += " | csdiff <(csgrep '%s' --mode=grep --invert-regex --checker '%s' %s) -" \
+            cmd += " | csdiff <(csgrep '%s' --mode=json --drop-scan-props --invert-regex --checker '%s' %s) -" \
                     % (js_file, chk_re, csgrep_args)
 
         # write the result into *-imp.js