You can just pass now one cocci file with the --test-cocci to test
only that single Coccinelle SmPL patch.
On my Chromebook Pixel:
$ time ./gentree.py --clean --verbose --test-cocci \
patches/collateral-evolutions/network/11-dev-pm-ops.cocci \
/home/mcgrof/linux-next/ \
/home/mcgrof/build/backports-20131206
real 5m39.361s
user 5m24.148s
sys 0m7.772s
Note run time with --profile-cocci on the same system:
real 6m25.778s
user 6m4.912s
sys 0m8.060s
The an original copy of the souce directory will be kept under the
target directory, renamed with .orig.
Cc: Peter Senna <peter.senna@xxxxxxxxx>
Cc: Julia Lawall <julia.lawall@xxxxxxx>
Cc: Gilles Muller <Gilles.Muller@xxxxxxx>
Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxx>
---
gentree.py | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gentree.py b/gentree.py
index 8aaf11e..cacb58a 100755
--- a/gentree.py
+++ b/gentree.py
@@ -472,6 +472,8 @@ def _main():
'however run `kup ls` on the target paths so ' +
'at the very least we test your kup configuration. ' +
'If this is your first time uploading use this first!')
+ parser.add_argument('--test-cocci', metavar='<sp_file>', type=str, default=None,
+ help='Only use the cocci file passed for Coccinelle, don\'t do anything else')
parser.add_argument('--profile-cocci', metavar='<sp_file>', type=str, default=None,
help='Only use the cocci file passed and pass --profile to Coccinelle.')
args = parser.parse_args()
@@ -488,6 +490,7 @@ def _main():
extra_driver=args.extra_driver,
kup=args.kup,
kup_test=args.kup_test,
+ test_cocci=args.test_cocci,
profile_cocci=args.profile_cocci,
logwrite=logwrite)
@@ -495,6 +498,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
clean=False, refresh=False, base_name="Linux", gitdebug=False,
verbose=False, extra_driver=[], kup=False,
kup_test=False,
+ test_cocci=None,
profile_cocci=None,
logwrite=lambda x:None,
git_tracked_version=False):
@@ -503,6 +507,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
git_revision, clean, refresh, base_name,
gitdebug, verbose, extra_driver, kup,
kup_test,
+ test_cocci,
profile_cocci):
self.kerneldir = kerneldir
self.outdir = outdir
@@ -516,6 +521,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
self.extra_driver = extra_driver
self.kup = kup
self.kup_test = kup_test
+ self.test_cocci = test_cocci
self.profile_cocci = profile_cocci
def git_paranoia(tree=None, logwrite=lambda x:None):
data = git.paranoia(tree)
@@ -529,7 +535,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
args = Args(kerneldir, outdir, copy_list_file,
git_revision, clean, refresh, base_name,
gitdebug, verbose, extra_driver, kup, kup_test,
- profile_cocci)
+ test_cocci, profile_cocci)
rel_prep = None
# start processing ...
@@ -599,8 +605,8 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
bpcfg.disable_symbols(disable_list)
git_debug_snapshot(args, 'Add automatic backports')
- # Extend with other tests for Coccinelle
- test_cocci = args.profile_cocci
+ test_cocci = args.profile_cocci or \
+ args.test_cocci
if test_cocci:
test_cocci = test_cocci.split('/')[-1]
orig_dir = args.outdir + '.orig'
@@ -618,7 +624,9 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
if test_cocci:
if f != test_cocci:
continue
- if args.profile_cocci:
+ if args.test_cocci:
+ logwrite("Testing Coccinelle SmPL patch: %s" % test_cocci)
+ elif args.profile_cocci:
logwrite("Profiling Coccinelle SmPL patch: %s" % test_cocci)
sempatches.append(os.path.join(root, f))
patches.sort()
--
1.8.4.3
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
