From b9b6e1fc12c78675d9c8d66675b9f1462f88d6a1 Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Tue, 21 May 2024 18:33:15 +0200
Subject: [PATCH] fix snakefile

---
 fuzzers/FRET/benchmark/Snakefile | 42 +++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/fuzzers/FRET/benchmark/Snakefile b/fuzzers/FRET/benchmark/Snakefile
index f19b6e025f..e372779d70 100644
--- a/fuzzers/FRET/benchmark/Snakefile
+++ b/fuzzers/FRET/benchmark/Snakefile
@@ -28,19 +28,19 @@ rule build_frafl:
     output:
         directory("bins/target_frafl")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_afl,feed_longest"
+        "cargo build --target-dir {output} {def_flags},config_frafl,feed_longest"
 
 rule build_afl:
     output:
         directory("bins/target_afl")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_afl,observer_hitcounts"
+        "cargo build --target-dir {output} {def_flags},config_afl,observer_hitcounts"
 
 rule build_stg:
     output:
         directory("bins/target_stg")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_stg"
+        "cargo build --target-dir {output} {def_flags},config_stg"
 
 rule build_showmap_int:
     output:
@@ -59,19 +59,19 @@ rule build_frafl_int:
     output:
         directory("bins/target_frafl_int")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_afl,feed_longest,fuzz_int"
+        "cargo build --target-dir {output} {def_flags},config_frafl,fuzz_int"
 
 rule build_afl_int:
     output:
         directory("bins/target_afl_int")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_afl,fuzz_int,observer_hitcounts"
+        "cargo build --target-dir {output} {def_flags},config_afl,fuzz_int,"
 
 rule build_stg_int:
     output:
         directory("bins/target_stg_int")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_stg,fuzz_int"
+        "cargo build --target-dir {output} {def_flags},config_stg,fuzz_int"
 
 rule build_feedgeneration1:
     output:
@@ -101,13 +101,13 @@ rule build_feedgeneration100:
     output:
         directory("bins/target_feedgeneration100")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_genetic,gensize_100"
+        "cargo build --target-dir {output} {def_flags},config_genetic,gensize_100"
 
 rule build_feedgeneration100_int:
     output:
         directory("bins/target_feedgeneration100_int")
     shell:
-        "cargo build --target-dir {output} {def_flags},feed_genetic,fuzz_int,gensize_100"
+        "cargo build --target-dir {output} {def_flags},config_genetic,fuzz_int,gensize_100"
 
 rule run_bench:
     input:
@@ -126,16 +126,24 @@ rule run_bench:
             fuzz_input=line['input_symbol']
             fuzz_len=line['input_size']
             bkp=line['return_function']
-            script="""
-                export RUST_BACKTRACE=1
-                mkdir -p $(dirname {output[0]})
-                set +e
-                echo $(pwd)/{input[1]}/debug/fret -n $(pwd)/timedump/{wildcards.fuzzer}/{wildcards.target}#{wildcards.num} -t -a -r -g -k {input[0]} -c ./target_symbols.csv fuzz -t {RUNTIME} -s {wildcards.num}
-                $(pwd)/{input[1]}/debug/fret -n $(pwd)/timedump/{wildcards.fuzzer}/{wildcards.target}#{wildcards.num} -t -a -r -g -k {input[0]} -c ./target_symbols.csv fuzz -t {RUNTIME} -s {wildcards.num} > {output[1]} 2>&1
-                exit 0
-                """
             if wildcards.fuzzer.find('random') >= 0:
-                script="export FUZZ_RANDOM={output[1]}\n"+script
+                script="""
+                    export RUST_BACKTRACE=1
+                    mkdir -p $(dirname {output[0]})
+                    set +e
+                    echo $(pwd)/{input[1]}/debug/fret -n $(pwd)/timedump/{wildcards.fuzzer}/{wildcards.target}#{wildcards.num} -t -a -r -g -k {input[0]} -c ./target_symbols.csv fuzz --random -t {RUNTIME} -s {wildcards.num}
+                    $(pwd)/{input[1]}/debug/fret -n $(pwd)/timedump/{wildcards.fuzzer}/{wildcards.target}#{wildcards.num} -t -a -r -g -k {input[0]} -c ./target_symbols.csv fuzz --random -t {RUNTIME} -s {wildcards.num} > {output[1]} 2>&1
+                    exit 0
+                    """
+            else:
+                script="""
+                    export RUST_BACKTRACE=1
+                    mkdir -p $(dirname {output[0]})
+                    set +e
+                    echo $(pwd)/{input[1]}/debug/fret -n $(pwd)/timedump/{wildcards.fuzzer}/{wildcards.target}#{wildcards.num} -t -a -r -g -k {input[0]} -c ./target_symbols.csv fuzz -t {RUNTIME} -s {wildcards.num}
+                    $(pwd)/{input[1]}/debug/fret -n $(pwd)/timedump/{wildcards.fuzzer}/{wildcards.target}#{wildcards.num} -t -a -r -g -k {input[0]} -c ./target_symbols.csv fuzz -t {RUNTIME} -s {wildcards.num} > {output[1]} 2>&1
+                    exit 0
+                    """
             shell(script)
 
 rule run_showmap: