Enable debug logging in tests

Unit tests call runsc directly now, so all command line arguments
are valid. On the other hand, enabling debug in the test binary
doesn't affect runsc. It needs to be set in the config.

PiperOrigin-RevId: 200237706
Change-Id: I0b5922db17f887f58192dbc2f8dd2fd058b76ec7
This commit is contained in:
Fabricio Voznika
2018-06-12 10:25:55 -07:00
committed by Shentubot
parent 41f766893a
commit 48335318a2
2 changed files with 6 additions and 14 deletions
-8
View File
@@ -176,18 +176,10 @@ type Config struct {
// DisableSeccomp indicates whether seccomp syscall filters should be
// disabled. Pardon the double negation, but default to enabled is important.
DisableSeccomp bool
// TestModeNoFlags indicates that the ToFlags method should return
// empty. This should only be used in tests, since the test runner does
// not know about all the flags.
TestModeNoFlags bool
}
// ToFlags returns a slice of flags that correspond to the given Config.
func (c *Config) ToFlags() []string {
if c.TestModeNoFlags {
return nil
}
return []string{
"--root=" + c.RootDir,
"--debug=" + strconv.FormatBool(c.Debug),
+6 -6
View File
@@ -117,12 +117,12 @@ func SetupContainerInRoot(rootDir string, spec *specs.Spec) (bundleDir string, c
}
conf = &boot.Config{
RootDir: rootDir,
Network: boot.NetworkNone,
// Don't add flags when calling subprocesses, since the test
// runner does not know about all the flags. We control the
// Config in the subprocess anyways, so it does not matter.
TestModeNoFlags: true,
Debug: true,
LogFormat: "text",
LogPackets: true,
Network: boot.NetworkNone,
RootDir: rootDir,
Strace: true,
}
return bundleDir, conf, nil