Make Target generic

Author: tysmith

.gitignore

@@ -63,9 +63,6 @@ instance/
 # Sphinx documentation
 docs/_build/
 
-# PyBuilder
-target/
-
 # IPython Notebook
 .ipynb_checkpoints
 

grizzly/args.py

@@ -28,6 +28,7 @@ def add_arguments(self, actions):
 
 class CommonArgs(object):
     IGNORABLE = ("log-limit", "memory", "timeout")
+    PLATFORMS = ("local",)
 
     def __init__(self):
         self._sanity_skip = set()
@@ -60,6 +61,9 @@ def __init__(self):
         self.parser.add_argument(
             "-m", "--memory", type=int,
             help="Browser process memory limit in MBs (default: 'no limit')")
+        self.parser.add_argument(
+            "--platform", default="local",
+            help="Platforms available: %s (default: %%(default)s)" % ", ".join(self.PLATFORMS))
         self.parser.add_argument(
             "-p", "--prefs",
             help="prefs.js file to use")
@@ -117,6 +121,9 @@ def sanity_check(self, args):
                 if not os.path.isdir(ext) or (os.path.isfile(ext) and ext.endswith(".xpi")):
                     self.parser.error("Extension must be a folder or .xpi")
 
+        if args.platform.lower() not in self.PLATFORMS:
+            self.parser.error("Unsupported platform %r" % args.platform)
+
         if args.prefs is not None and not os.path.isfile(args.prefs):
             self.parser.error("file not found: %r" % args.prefs)
 

grizzly/core.py

@@ -32,7 +32,8 @@
 from .reporter import FilesystemReporter, FuzzManagerReporter, S3FuzzManagerReporter
 from .status import Status
 from .corpman.storage import TestFile
-from .target import Target
+from .target import PuppetTarget
+
 
 __author__ = "Tyson Smith"
 __credits__ = ["Tyson Smith", "Jesse Schwartzentruber"]
@@ -223,11 +224,11 @@ def run(self):
                 self.iomanager.tests.pop().cleanup()
 
             # handle failure if detected
-            if failure_detected == Target.RESULT_FAILURE:
+            if failure_detected == self.target.RESULT_FAILURE:
                 self.status.results += 1
                 log.info("Result detected")
                 self.report_result()
-            elif failure_detected == Target.RESULT_IGNORED:
+            elif failure_detected == self.target.RESULT_IGNORED:
                 self.status.ignored += 1
                 log.info("Ignored (%d)", self.status.ignored)
 
@@ -314,17 +315,18 @@ def main(args):
             log.info("Running in FUZZING mode")
 
         log.debug("initializing the Target")
-        target = Target(
-            args.binary,
-            args.extension,
-            args.launch_timeout,
-            args.log_limit,
-            args.memory,
-            args.prefs,
-            args.relaunch,
-            args.rr,
-            args.valgrind,
-            args.xvfb)
+        if args.platform == "local":
+            target = PuppetTarget(
+                args.binary,
+                args.extension,
+                args.launch_timeout,
+                args.log_limit,
+                args.memory,
+                args.prefs,
+                args.relaunch,
+                args.rr,
+                args.valgrind,
+                args.xvfb)
         adapter.monitor = target.monitor
         if args.soft_asserts:
             target.add_abort_token("###!!! ASSERTION:")
@@ -375,7 +377,7 @@ def main(args):
         if session is not None:
             session.close()
         if target is not None:
-            if target.rr_path is not None and os.path.isdir(target.rr_path):
+            if target.use_rr and target.rr_path is not None and os.path.isdir(target.rr_path):
                 shutil.rmtree(target.rr_path)
             target.cleanup()
         if adapter is not None:

grizzly/reduce/interesting.py

@@ -18,7 +18,7 @@
 import ffpuppet
 import sapphire
 from ..reporter import FuzzManagerReporter, Report
-from ..target import Target
+from ..target.target import Target
 
 
 __author__ = "Jesse Schwartzentruber"
@@ -295,7 +295,7 @@ def _dyn_resp_close():
                 self.server.add_dynamic_response("/harness", lambda: harness, mime_type="text/html")
                 self.server.set_redirect("/first_test", str(self.landing_page), required=True)
 
-        # (re)launch FFPuppet
+        # (re)launch Target
         if self.target.closed:
             # Try to launch the browser at most, 4 times
             for retries in reversed(range(4)):
@@ -375,7 +375,7 @@ def keep_waiting():
                         self.orig_sig = crash.createCrashSignature(maxFrames=max_frames)
                     # the amount of time it can take to replay a test case can vary
                     # when under Valgrind so do not update the timeout in that case
-                    if not self.target.use_valgrind:
+                    if not getattr(self.target, "use_valgrind", False):
                         self.update_timeout(end_time - start_time)
                 else:
                     LOG.info("Uninteresting: different signature: %s", short_sig)

grizzly/reduce/reduce.py

@@ -27,7 +27,7 @@
 from ..core import Session
 from ..corpman.storage import TestFile, TestCase
 from ..reporter import FilesystemReporter, FuzzManagerReporter, Report
-from ..target import Target
+from ..target import PuppetTarget
 
 
 __author__ = "Jesse Schwartzentruber"
@@ -732,17 +732,18 @@ def main(args, interesting_cb=None, result_cb=None):
     job_cancelled = False
     try:
         LOG.debug("initializing the Target")
-        target = Target(
-            args.binary,
-            args.extension,
-            args.launch_timeout,
-            args.log_limit,
-            args.memory,
-            None,
-            args.relaunch,
-            False,  # rr
-            args.valgrind,
-            args.xvfb)
+        if args.platform == "local":
+            target = PuppetTarget(
+                args.binary,
+                args.extension,
+                args.launch_timeout,
+                args.log_limit,
+                args.memory,
+                None,  # prefs
+                args.relaunch,
+                False,  # rr
+                args.valgrind,
+                args.xvfb)
 
         job = ReductionJob(
             args.ignore,
@@ -787,7 +788,7 @@ def main(args, interesting_cb=None, result_cb=None):
 
         # detect soft assertions
         if args.soft_asserts:
-            job.interesting.target._puppet.add_abort_token("###!!! ASSERTION:")
+            job.interesting.target.add_abort_token("###!!! ASSERTION:")
 
         # setup interesting callback if requested
         if interesting_cb is not None:

grizzly/reduce/test_common.py

@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import unicode_literals
 import os
-from grizzly.target import Target
+from grizzly.target.target import Target
 from grizzly.reporter import Reporter
 
 

grizzly/reduce/test_interesting.py

@@ -9,7 +9,7 @@
 import ffpuppet
 import sapphire
 from grizzly.reduce.interesting import Interesting
-from grizzly.target import Target
+from grizzly.target.target import Target
 from .test_common import FakeTarget, create_target_binary
 
 

grizzly/target/__init__.py

@@ -0,0 +1,11 @@
+# coding=utf-8
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from .puppet_target import PuppetTarget
+from .target import Target
+
+__all__ = ("PuppetTarget", "Target")
+__author__ = "Tyson Smith"
+__credits__ = ["Tyson Smith", "Jesse Schwartzentruber"]