From 2cdab3500dad2d880ae73ca50cd6e7709d8f4500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com> Date: Thu, 2 Jan 2020 23:37:31 +0100 Subject: [PATCH] Remove docker, use native KLEE --- gdb.py | 11 +---------- klee_stm_gdb.py | 12 ++---------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/gdb.py b/gdb.py index 817bd7f..fa25058 100644 --- a/gdb.py +++ b/gdb.py @@ -352,9 +352,6 @@ def ktest_iterate(): print(rustoutputfolder + "not found. Need to run\n") print("xargo build --example " + example_name + " --features" + " klee_mode --target x86_64-unknown-linux-gnu ") - print("\nand docker run --rm --user (id -u):(id -g)" + - "-v $PWD" + "/" + klee_out_folder + ":/mnt" + - "-w /mnt -it afoht/llvm-klee-4 /bin/bash ") if autobuild: xargo_run("klee") klee_run() @@ -459,13 +456,7 @@ def klee_run(): print(PWD + "/" + klee_out_folder) print(bc_file) - klee_cmd = ("docker run --rm --user " + - user_id[:-1] + ":" + group_id[:-1] + - " -v '" - + PWD + "/" - + klee_out_folder + "':'/mnt'" + - " -w /mnt -it afoht/llvm-klee-4 " + - "/bin/bash -c 'klee %s'" % bc_file) + klee_cmd = ("klee %s" % bc_file) if debug: print(klee_cmd) call(klee_cmd, shell=True) diff --git a/klee_stm_gdb.py b/klee_stm_gdb.py index 57fa79e..2177b0b 100644 --- a/klee_stm_gdb.py +++ b/klee_stm_gdb.py @@ -420,9 +420,6 @@ def ktest_iterate(): print(rustoutputfolder + "not found. Need to run\n") print("xargo build --example " + example_name + " --features" + "klee_mode --target x86_64-unknown-linux-gnu ") - print("\nand docker run --rm --user (id -u):(id -g)" + - "-v $PWD" + "/" + klee_out_folder + ":/mnt" + - "-w /mnt -it afoht/llvm-klee-4 /bin/bash ") if autobuild: xargo_run("klee") klee_run() @@ -524,13 +521,8 @@ def klee_run(): print(PWD + "/" + klee_out_folder) print(bc_file) - klee_cmd = ("docker run --rm --user " + - user_id[:-1] + ":" + group_id[:-1] + - " -v '" - + PWD + "/" - + klee_out_folder + "':'/mnt'" + - " -w /mnt -it afoht/llvm-klee-4 " + - "/bin/bash -c 'klee %s'" % bc_file) + klee_cmd = ("klee %s" % bc_file) + if debug: print(klee_cmd) call(klee_cmd, shell=True) -- GitLab