aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2016-01-27 13:42:00 +0100
committerDmitry Vyukov <dvyukov@google.com>2016-01-27 13:42:00 +0100
commit9aec072a77b50a40e074d029573b65d4606ea1e1 (patch)
tree0c35e37846c41d1c6ecb065c1b394c4da3ddb95d /tools
parentf9ad59cfb90827fb04f2b03ed0f5bbc13d971db2 (diff)
ipc: remove strace support traces
It is not working and not tested, and can't be restored with new namespace sandboxing code.
Diffstat (limited to 'tools')
-rw-r--r--tools/syz-execprog/execprog.go9
-rw-r--r--tools/syz-stress/stress.go2
2 files changed, 2 insertions, 9 deletions
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index acaa0e101..e96d27efc 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -26,7 +26,6 @@ var (
flagThreaded = flag.Bool("threaded", true, "use threaded mode in executor")
flagCollide = flag.Bool("collide", true, "collide syscalls to provoke data races")
flagDebug = flag.Bool("debug", false, "debug output from executor")
- flagStrace = flag.Bool("strace", false, "run executor under strace")
flagCover = flag.Bool("cover", true, "collect coverage")
flagCoverFile = flag.String("coverfile", "", "write coverage to the file")
flagNobody = flag.Bool("nobody", true, "impersonate into nobody")
@@ -70,9 +69,6 @@ func main() {
if *flagDebug {
flags |= ipc.FlagDebug
}
- if *flagStrace {
- flags |= ipc.FlagStrace
- }
if *flagCover || *flagCoverFile != "" {
flags |= ipc.FlagCover
}
@@ -109,16 +105,13 @@ func main() {
return
}
p := progs[idx%len(progs)]
- output, strace, cov, _, failed, hanged, err := env.Exec(p)
+ output, cov, _, failed, hanged, err := env.Exec(p)
if failed {
fmt.Printf("BUG: executor-detected bug:\n%s", output)
}
if *flagDebug || err != nil {
fmt.Printf("result: failed=%v hanged=%v err=%v\n\n%s", failed, hanged, err, output)
}
- if *flagStrace {
- fmt.Printf("strace output:\n%s", strace)
- }
if *flagCoverFile != "" {
// Coverage is dumped in sanitizer format.
// github.com/google/sanitizers/tools/sancov command can be used to dump PCs,
diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go
index e88f74454..bb17cef75 100644
--- a/tools/syz-stress/stress.go
+++ b/tools/syz-stress/stress.go
@@ -113,7 +113,7 @@ func execute(pid int, env *ipc.Env, p *prog.Prog) {
outMu.Unlock()
}
- output, _, _, _, _, _, err := env.Exec(p)
+ output, _, _, _, _, err := env.Exec(p)
if err != nil {
fmt.Printf("failed to execute executor: %v\n", err)
}