UA11-008 gnatfuzz.py: remove passing of AFL_Mode

Also add a GUI for selecting the AFL_MODE.

Clear the list of previous "analyze" messages as needed.

Adapt to the fact that we now pass the name of the file
as first parameter to the harness executable.

Solves AdaCore/gnatfuzz#440

Change-Id: Ide3c6f09bca69362b8d5a51b8ef592a9815d3997

Author: setton

share/support/ui/gnatfuzz.py

@@ -70,7 +70,7 @@ class GNATfuzzPlugin(Module):
             X("description").children("Launch gnatfuzz fuzz"),
             X("command-line").children(),
             X("iconname").children("gps-build-all-symbolic"),
-            X("switches", command="gnatfuzz", columns="2", lines="2").children(
+            X("switches", command="gnatfuzz", columns="2", lines="1").children(
                 X(
                     "spin",
                     line="1",
@@ -83,6 +83,25 @@ class GNATfuzzPlugin(Module):
                     max="32",
                     tip="The number of cores to use. Use 0 for automatic.",
                 ),
+                X(
+                    "combo",
+                    line="1",
+                    column="1",
+                    label="AFL mode",
+                    separator="=",
+                    switch="--afl-mode",
+                    default="PERSIST",
+                    tip="The AFL run mode. See the AFL++ documentation.",
+                ).children(
+                    X("combo-entry", label="PLAIN", value="afl_plain"),
+                    X("combo-entry", label="PERSIST", value="afl_persist"),
+                    X("combo-entry", label="DEFER", value="afl_defer"),
+                    X(
+                        "combo-entry",
+                        label="DEFER_AND_PERSIST",
+                        value="afl_defer_and_persist",
+                    ),
+                ),
             ),
         ),
         X(
@@ -439,13 +458,20 @@ def gnatfuzz_analyze_file_workflow(self, task):
             return
         self.process_analyze_messages()
 
+    def clear_analyze_messages(self):
+        """Clear messages generated by 'gnatfuzz analyze'"""
+        for m in GPS.Message.list(category="Fuzzable Subprograms"):
+            m.remove()
+
     def gnatfuzz_analyze_project(self):
         """Action to launch the 'gnatfuzz analyze' workflow"""
+        self.clear_analyze_messages()
         workflows.task_workflow(
             "gnatfuzz analyze", self.gnatfuzz_analyze_project_workflow
         )
 
     def gnatfuzz_analyze_file(self):
+        self.clear_analyze_messages()
         """Action to launch the 'gnatfuzz analyze' workflow on a file"""
         workflows.task_workflow("gnatfuzz analyze", self.gnatfuzz_analyze_file_workflow)
 
@@ -484,7 +510,7 @@ def gnatfuzz_fuzz_workflow(self, task):
         for variable, value in GPS.Project.scenario_variables().items():
             # We pass all -X switches except the ones that are internal
             # to gnatfuzz.
-            if not variable.startswith("GNATFUZZ"):
+            if not (variable.startswith("GNATFUZZ") or variable == "AFL_MODE"):
                 args.append(f"-X{variable}={value}")
 
         args.extend(

share/support/ui/gnatfuzz_view.py

@@ -116,7 +116,7 @@ def debug_candidate(self, task):
             executable=GPS.File(os.path.join(proj.object_dirs()[0], exec))
         )
         d.send("delete")
-        d.send(f"start < {self.target_candidate}")
+        d.send(f"start {self.target_candidate}")
         d.send("catch exception")
         d.send("cont")
         d.send("up")  # Hack, wrong frame for gdb here.
@@ -190,7 +190,7 @@ def process_crashes(self, task):
                 # We're actually launching the executable to get the
                 # parameters that were passed to the crash, along with
                 # the actual crash message.
-                cl = ["/bin/bash", "-c", f"{executable} < {candidate}"]
+                cl = [executable, candidate]
                 p = ProcessWrapper(cl)
                 status, output = yield p.wait_until_terminate()
                 c = FuzzCrash(candidate)