Remove --release from Makefile.toml (#1522)

* rem release

* Revert "rem release"

This reverts commit 13aaf13.

* toggle it with envvar

* fm

Author: tokatoka

fuzzers/baby_fuzzer_swap_differential/Makefile.toml

@@ -3,23 +3,24 @@
 FUZZER_NAME='fuzzer_sd'
 PROJECT_DIR = { script = ["pwd"] }
 CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
-LIBAFL_CC = '${CARGO_TARGET_DIR}/release/libafl_cc'
-FUZZER = '${CARGO_TARGET_DIR}/release/${FUZZER_NAME}'
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
+LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE}/libafl_cc'
+FUZZER = '${CARGO_TARGET_DIR}/${PROFILE}/${FUZZER_NAME}'
 
 # Compilers
 [tasks.cc]
 command = "cargo"
-args = ["build" , "--release", "--bin", "libafl_cc"]
+args = ["build" , "--${PROFILE}", "--bin", "libafl_cc"]
 
 # Harness
 [tasks.fuzzer]
 command = "cargo"
-args = ["build" , "--release", "--bin", "${FUZZER_NAME}"]
+args = ["build" , "--${PROFILE}", "--bin", "${FUZZER_NAME}"]
 dependencies = [ "cc" ]
 
 # Run the fuzzer
 [tasks.run]
-command = "${CARGO_TARGET_DIR}/release/${FUZZER_NAME}"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/${FUZZER_NAME}"
 dependencies = [ "fuzzer" ]
 
 # Test
@@ -31,7 +32,7 @@ windows_alias = "unsupported"
 [tasks.test_unix]
 script_runner = "@shell"
 script='''
-timeout 10s ${CARGO_TARGET_DIR}/release/${FUZZER_NAME} >fuzz_stdout.log || true
+timeout 10s ${CARGO_TARGET_DIR}/${PROFILE}/${FUZZER_NAME} >fuzz_stdout.log || true
 if [ -z "$(grep "objectives: 1" fuzz_stdout.log)" ]; then
     echo "Fuzzer does not generate any testcases or any crashes"
     exit 1

fuzzers/baby_no_std/Makefile.toml

@@ -1,6 +1,7 @@
 [env]
 FUZZER_NAME="fuzzer"
 PROJECT_DIR = { script = ["pwd"] }
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -11,7 +12,7 @@ echo "Cargo-make not integrated yet on this"
 # Fuzzer
 [tasks.build]
 command = "cargo"
-args = ["build", "--release", "-Zbuild-std=core,alloc", "--target", "x86_64-unknown-linux-gnu"]
+args = ["build", "--${PROFILE}", "-Zbuild-std=core,alloc", "--target", "x86_64-unknown-linux-gnu"]
 
 # Test
 [tasks.test]
@@ -26,7 +27,7 @@ cargo run -Zbuild-std=core,alloc --target x86_64-unknown-linux-gnu || true
 dependencies = ["build"]
 
 [tasks.build_aarch]
-script = "cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release"
+script = "cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --${PROFILE}"
 
 # Clean
 [tasks.clean]

fuzzers/forkserver_libafl_cc/Makefile.toml

@@ -2,9 +2,10 @@
 [env]
 FUZZER_NAME='fuzzer_libafl_cc'
 CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
-LIBAFL_CC = '${CARGO_TARGET_DIR}/release/libafl_cc'
-LIBAFL_CXX = '${CARGO_TARGET_DIR}/release/libafl_cxx'
-FUZZER = '${CARGO_TARGET_DIR}/release/${FUZZER_NAME}'
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
+LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE}/libafl_cc'
+LIBAFL_CXX = '${CARGO_TARGET_DIR}/${PROFILE}/libafl_cxx'
+FUZZER = '${CARGO_TARGET_DIR}/${PROFILE}/${FUZZER_NAME}'
 PROJECT_DIR = { script = ["pwd"] }
 
 [tasks.unsupported]
@@ -21,7 +22,7 @@ windows_alias = "unsupported"
 
 [tasks.cxx_unix]
 command = "cargo"
-args = ["build" , "--release"]
+args = ["build" , "--${PROFILE}"]
 
 [tasks.cc]
 linux_alias = "cc_unix"
@@ -30,7 +31,7 @@ windows_alias = "unsupported"
 
 [tasks.cc_unix]
 command = "cargo"
-args = ["build" , "--release"]
+args = ["build" , "--${PROFILE}"]
 
 [tasks.crash_cxx]
 linux_alias = "crash_cxx_unix"
@@ -39,7 +40,7 @@ windows_alias = "unsupported"
 
 [tasks.crash_cxx_unix]
 command = "cargo"
-args = ["build" , "--release", "--features=crash"]
+args = ["build" , "--${PROFILE}", "--features=crash"]
 
 [tasks.crash_cc]
 linux_alias = "crash_cc_unix"
@@ -48,7 +49,7 @@ windows_alias = "unsupported"
 
 [tasks.crash_cc_unix]
 command = "cargo"
-args = ["build" , "--release", "--features=crash"]
+args = ["build" , "--${PROFILE}", "--features=crash"]
 
 # Harness
 [tasks.fuzzer]
@@ -57,7 +58,7 @@ mac_alias = "fuzzer_unix"
 windows_alias = "unsupported"
 
 [tasks.fuzzer_unix]
-command = "${CARGO_TARGET_DIR}/release/libafl_cc"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/libafl_cc"
 args = ["${PROJECT_DIR}/src/program.c", "-o", "${FUZZER_NAME}", "-lm"]
 dependencies = [ "cxx", "cc" ]
 
@@ -68,7 +69,7 @@ mac_alias = "fuzzer_crash_unix"
 windows_alias = "unsupported"
 
 [tasks.fuzzer_crash_unix]
-command = "${CARGO_TARGET_DIR}/release/libafl_cc"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/libafl_cc"
 args = ["${PROJECT_DIR}/src/program.c", "-o", "${FUZZER_NAME}_crash", "-lm"]
 dependencies = [ "crash_cxx", "crash_cc" ]
 
@@ -81,7 +82,7 @@ windows_alias = "unsupported"
 [tasks.run_unix]
 script_runner = "@shell"
 script='''
-taskset -c 1 ${CARGO_TARGET_DIR}/release/${CARGO_MAKE_PROJECT_NAME} ./${FUZZER_NAME} ./corpus/ -t 1000
+taskset -c 1 ${CARGO_TARGET_DIR}/${PROFILE}/${CARGO_MAKE_PROJECT_NAME} ./${FUZZER_NAME} ./corpus/ -t 1000
 '''
 dependencies = [ "fuzzer" ]
 
@@ -95,7 +96,7 @@ windows_alias = "unsupported"
 [tasks.crash_unix]
 script_runner = "@shell"
 script='''
-taskset -c 1 ${CARGO_TARGET_DIR}/release/${CARGO_MAKE_PROJECT_NAME} ./${FUZZER_NAME}_crash ./corpus/ -t 1000
+taskset -c 1 ${CARGO_TARGET_DIR}/${PROFILE}/${CARGO_MAKE_PROJECT_NAME} ./${FUZZER_NAME}_crash ./corpus/ -t 1000
 '''
 dependencies = [ "fuzzer_crash" ]
 

fuzzers/frida_executable_libpng/Makefile.toml

@@ -1,7 +1,7 @@
 # Variables
 [env]
 CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
-
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -61,7 +61,7 @@ windows_alias = "unsupported"
 [tasks.fuzzer_unix]
 script_runner="@shell"
 script='''
-cargo build --release
+cargo build --${PROFILE}
 '''
 
 # Run the fuzzer
@@ -73,7 +73,7 @@ windows_alias = "unsupported"
 [tasks.run_unix]
 script_runner = "@shell"
 script='''
-LD_PRELOAD=$CARGO_TARGET_DIR/release/libfrida_executable_fuzzer.so ./libpng-harness -i corpus -o out -H ./libpng-harness
+LD_PRELOAD=$CARGO_TARGET_DIR/${PROFILE}/libfrida_executable_fuzzer.so ./libpng-harness -i corpus -o out -H ./libpng-harness
 '''
 dependencies = [ "fuzzer", "harness" ]
 
@@ -87,7 +87,7 @@ windows_alias = "unsupported"
 script_runner = "@shell"
 script='''
 rm -rf libafl_unix_shmem_server || true
-LD_PRELOAD=$CARGO_TARGET_DIR/release/libfrida_executable_fuzzer.so ./libpng-harness -i corpus -o out -H ./libpng-harness > fuzz_stdout.log &
+LD_PRELOAD=$CARGO_TARGET_DIR/${PROFILE}/libfrida_executable_fuzzer.so ./libpng-harness -i corpus -o out -H ./libpng-harness > fuzz_stdout.log &
 sleep 10s && pkill libpng-harness
 if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
     echo "Fuzzer does not generate any testcases or any crashes"

fuzzers/frida_gdiplus/Makefile.toml

@@ -2,7 +2,7 @@
 [env]
 CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
 FUZZER_NAME={ source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "frida_gdiplus", mapping = {"linux" = "frida_gdiplus", "macos" = "frida_gdiplus", "windows" = "frida_gdiplus.exe"} }
-
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -32,8 +32,8 @@ windows_alias = "fuzzer_windows"
 [tasks.fuzzer_windows]
 script_runner="@shell"
 script='''
-cargo build --release
-cp ./target/release/${FUZZER_NAME} .
+cargo build --${PROFILE}
+cp ./target/${PROFILE}/${FUZZER_NAME} .
 '''
 
 # Run the fuzzer

fuzzers/frida_libpng/Makefile.toml

@@ -2,7 +2,7 @@
 [env]
 CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
 FUZZER_NAME={ source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "frida_fuzzer", mapping = {"linux" = "frida_fuzzer", "macos" = "frida_fuzzer", "windows" = "frida_fuzzer.exe"} }
-
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -68,15 +68,15 @@ windows_alias = "fuzzer_windows"
 [tasks.fuzzer_unix]
 script_runner="@shell"
 script='''
-cargo build --release
-cp ${CARGO_TARGET_DIR}/release/${FUZZER_NAME} .
+cargo build --${PROFILE}
+cp ${CARGO_TARGET_DIR}/${PROFILE}/${FUZZER_NAME} .
 '''
 
 [tasks.fuzzer_windows]
 script_runner="@shell"
 script='''
-cargo build --release
-cp ./target/release/${FUZZER_NAME} .
+cargo build --${PROFILE}
+cp ./target/${PROFILE}/${FUZZER_NAME} .
 '''
 
 # Run the fuzzer

fuzzers/fuzzbench/Makefile.toml

@@ -2,6 +2,7 @@
 PROJECT_DIR = { script = ["pwd"] }
 CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
 FUZZER_NAME="fuzzer"
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -17,7 +18,7 @@ windows_alias = "unsupported"
 
 [tasks.cxx_unix]
 command = "cargo"
-args = ["build" , "--release"]
+args = ["build" , "--${PROFILE}"]
 
 [tasks.cc]
 linux_alias = "cc_unix"
@@ -26,7 +27,7 @@ windows_alias = "unsupported"
 
 [tasks.cc_unix]
 command = "cargo"
-args = ["build" , "--release"]
+args = ["build" , "--${PROFILE}"]
 
 # fuzz.o File
 [tasks.fuzz_o]
@@ -35,7 +36,7 @@ mac_alias = "fuzz_o_unix"
 windows_alias = "unsupported"
 
 [tasks.fuzz_o_unix]
-command = "${CARGO_TARGET_DIR}/release/libafl_cc"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/libafl_cc"
 args = ["--libafl-no-link", "-O3", "-c", "fuzz.c", "-o", "fuzz.o"]
 dependencies = ["cc", "cxx"]
 
@@ -46,7 +47,7 @@ mac_alias = "fuzzer_unix"
 windows_alias = "unsupported"
 
 [tasks.fuzzer_unix]
-command = "${CARGO_TARGET_DIR}/release/libafl_cxx"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/libafl_cxx"
 args = ["--libafl", "fuzz.o", "-o", "${FUZZER_NAME}", "-lm", "-lz"]
 dependencies = ["cc", "cxx", "fuzz_o"]
 

fuzzers/fuzzbench_fork_qemu/Makefile.toml

@@ -2,6 +2,7 @@
 [env]
 FUZZER_NAME='libpng_harness'
 PROJECT_DIR = { script = ["pwd"] }
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -31,7 +32,7 @@ windows_alias = "unsupported"
 
 [tasks.fuzzer_unix]
 command = "cargo"
-args = ["build", "--release"]
+args = ["build", "--${PROFILE}"]
 
 # Harness
 [tasks.harness]
@@ -65,7 +66,7 @@ windows_alias = "unsupported"
 
 [tasks.run_unix]
 command = "cargo"
-args = ["run", "--release", "./${FUZZER_NAME}", "--", "--libafl-in", "../libfuzzer_libpng/corpus", "--libafl-out", "./out", "./${FUZZER_NAME}"]
+args = ["run", "--${PROFILE}", "./${FUZZER_NAME}", "--", "--libafl-in", "../libfuzzer_libpng/corpus", "--libafl-out", "./out", "./${FUZZER_NAME}"]
 dependencies = [ "harness", "fuzzer" ]
 
 # Run the fuzzer

fuzzers/fuzzbench_qemu/Makefile.toml

@@ -2,6 +2,7 @@
 [env]
 FUZZER_NAME='libpng_harness'
 PROJECT_DIR = { script = ["pwd"] }
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -31,7 +32,7 @@ windows_alias = "unsupported"
 
 [tasks.fuzzer_unix]
 command = "cargo"
-args = ["build", "--release"]
+args = ["build", "--${PROFILE}"]
 
 # Harness
 [tasks.harness]
@@ -65,7 +66,7 @@ windows_alias = "unsupported"
 
 [tasks.run_unix]
 command = "cargo"
-args = ["run", "--release", "./${FUZZER_NAME}", "--", "--libafl-in", "../libfuzzer_libpng/corpus", "--libafl-out", "./out", "./${FUZZER_NAME}"]
+args = ["run", "--${PROFILE}", "./${FUZZER_NAME}", "--", "--libafl-in", "../libfuzzer_libpng/corpus", "--libafl-out", "./out", "./${FUZZER_NAME}"]
 dependencies = [ "harness", "fuzzer" ]
 
 # Run the fuzzer

fuzzers/fuzzbench_text/Makefile.toml

@@ -2,6 +2,7 @@
 PROJECT_DIR = { script = ["pwd"] }
 CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
 FUZZER_NAME="fuzzer"
+PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} }
 
 [tasks.unsupported]
 script_runner="@shell"
@@ -17,7 +18,7 @@ windows_alias = "unsupported"
 
 [tasks.cxx_unix]
 command = "cargo"
-args = ["build" , "--release"]
+args = ["build" , "--${PROFILE}"]
 
 [tasks.cc]
 linux_alias = "cc_unix"
@@ -26,7 +27,7 @@ windows_alias = "unsupported"
 
 [tasks.cc_unix]
 command = "cargo"
-args = ["build" , "--release"]
+args = ["build" , "--${PROFILE}"]
 
 # fuzz.o File
 [tasks.fuzz_o]
@@ -35,7 +36,7 @@ mac_alias = "fuzz_o_unix"
 windows_alias = "unsupported"
 
 [tasks.fuzz_o_unix]
-command = "${CARGO_TARGET_DIR}/release/libafl_cc"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/libafl_cc"
 args = ["--libafl-no-link", "-O3", "-c", "fuzz.c", "-o", "fuzz.o"]
 dependencies = ["cc", "cxx"]
 
@@ -46,7 +47,7 @@ mac_alias = "fuzzer_unix"
 windows_alias = "unsupported"
 
 [tasks.fuzzer_unix]
-command = "${CARGO_TARGET_DIR}/release/libafl_cxx"
+command = "${CARGO_TARGET_DIR}/${PROFILE}/libafl_cxx"
 args = ["--libafl", "fuzz.o", "-o", "${FUZZER_NAME}", "-lm", "-lz"]
 dependencies = ["cc", "cxx", "fuzz_o"]