about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrea Fioraldi <andreafioraldi@gmail.com>2020-02-21 19:52:11 +0100
committerAndrea Fioraldi <andreafioraldi@gmail.com>2020-02-21 19:52:11 +0100
commit00c1c26bf85e3232ee6cf93e2bf4c8ccc49b4c85 (patch)
treea49e3f513a141caa622c6c4a2db9abef92fce0e9
parentf4e09634ccbd9f1f29e1820cf121bee8a6efec18 (diff)
parentec8e8cb51c870fad75157e4c12042380767a20c6 (diff)
downloadafl++-00c1c26bf85e3232ee6cf93e2bf4c8ccc49b4c85.tar.gz
Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus
-rw-r--r--include/envs.h1
-rwxr-xr-xtest/test.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/envs.h b/include/envs.h
index 994d6456..4650dc54 100644
--- a/include/envs.h
+++ b/include/envs.h
@@ -59,6 +59,7 @@ const char *afl_environment_variables[] = {
     "AFL_NO_CPU_RED",
     "AFL_NO_FORKSRV",
     "AFL_NO_UI",
+    "AFL_NO_X86", // not really an env but we dont want to warn on it
     "AFL_PATH",
     "AFL_PERFORMANCE_FILE",
     "AFL_PERSISTENT",
diff --git a/test/test.sh b/test/test.sh
index 844783ee..d5ba59da 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -38,6 +38,7 @@ INCOMPLETE=0
 export AFL_EXIT_WHEN_DONE=1
 export AFL_SKIP_CPUFREQ=1
 export AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1
+unset AFL_NO_X86
 unset AFL_QUIET
 unset AFL_DEBUG
 unset AFL_HARDEN