From 88e3a1226bc591d81c1fb98e83cb63cd4f341c6e Mon Sep 17 00:00:00 2001 From: Andrey Artemiev Date: Sat, 6 Aug 2022 05:17:33 -0700 Subject: pkg/csource, pkg/instance, pkg/ipc, pkg/mgrconfig, tools/syz-prog2c, syz-manager: introduce a new setting 'sandbox_arg' (#3263) --- pkg/instance/instance_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg/instance/instance_test.go') diff --git a/pkg/instance/instance_test.go b/pkg/instance/instance_test.go index 2f5c08625..843334ebd 100644 --- a/pkg/instance/instance_test.go +++ b/pkg/instance/instance_test.go @@ -16,7 +16,7 @@ import ( func TestFuzzerCmd(t *testing.T) { // IMPORTANT: if this test fails, do not fix it by changing flags here! - // Test how an old version of syz-fuzzer parses flags genereated by the current FuzzerCmd. + // Test how an old version of syz-fuzzer parses flags generated by the current FuzzerCmd. // This actually happens in syz-ci when we test a patch for an old bug and use an old syz-fuzzer/execprog. flags := flag.NewFlagSet("", flag.ContinueOnError) flagName := flags.String("name", "", "unique name for manager") @@ -29,11 +29,11 @@ func TestFuzzerCmd(t *testing.T) { flagTest := flags.Bool("test", false, "enable image testing mode") // used by syz-ci flagExecutor := flags.String("executor", "./syz-executor", "path to executor binary") flagSignal := flags.Bool("cover", false, "collect feedback signals (coverage)") - flagSandbox := flags.String("sandbox", "none", "sandbox for fuzzing (none/setuid/namespace)") + flagSandbox := flags.String("sandbox", "none", "sandbox for fuzzing (none/setuid/namespace/android)") flagDebug := flags.Bool("debug", false, "debug output from executor") flagV := flags.Int("v", 0, "verbosity") cmdLine := OldFuzzerCmd(os.Args[0], "/myexecutor", "myname", targets.Linux, targets.I386, "localhost:1234", - "namespace", 3, true, true, false, 5) + "namespace", 23, 3, true, true, false, 5) args := strings.Split(cmdLine, " ")[1:] if err := flags.Parse(args); err != nil { t.Fatal(err) @@ -96,10 +96,10 @@ func TestExecprogCmd(t *testing.T) { // sets this flag and never relies on the default value. flagCollide := flags.Bool("collide", false, "collide syscalls to provoke data races") flagSignal := flags.Bool("cover", false, "collect feedback signals (coverage)") - flagSandbox := flags.String("sandbox", "none", "sandbox for fuzzing (none/setuid/namespace)") + flagSandbox := flags.String("sandbox", "none", "sandbox for fuzzing (none/setuid/namespace/android)") flagSlowdown := flags.Int("slowdown", 1, "") cmdLine := ExecprogCmd(os.Args[0], "/myexecutor", targets.FreeBSD, targets.I386, - "namespace", true, false, true, 7, 2, 3, true, 10, "myprog") + "namespace", 3, true, false, true, 7, 2, 3, true, 10, "myprog") args := strings.Split(cmdLine, " ")[1:] if err := tool.ParseFlags(flags, args); err != nil { t.Fatal(err) -- cgit mrf-deployment