containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5020 from baude/bindingtestrootless 

Bindingtestrootless
This commit is contained in:
OpenShift Merge Robot 2020-01-30 15:24:51 -08:00 committed by GitHub
parent a3e14c87bb 1d9537e242
commit 4f96b17ef5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/bindings/test/common_test.go
View File

@ -62,6 +62,12 @@ func (b *bindingTest) runPodman(command []string) *gexec.Session {
} else { } else {
cmd = append(cmd, "--runroot", b.runRoot) cmd = append(cmd, "--runroot", b.runRoot)
} }
val, ok = os.LookupEnv("TEMPDIR")
if ok {
cmd = append(cmd, "--tmpdir", val)
} else {
cmd = append(cmd, "--tmpdir", b.tempDirPath)
}
val, ok = os.LookupEnv("STORAGE_DRIVER") val, ok = os.LookupEnv("STORAGE_DRIVER")
if ok { if ok {
cmd = append(cmd, "--storage-driver", val) cmd = append(cmd, "--storage-driver", val)

3
pkg/rootless/rootless_linux.c
View File

@ -200,6 +200,9 @@ can_use_shortcut ()
if (argv == NULL) if (argv == NULL)
return false; return false;
if (strstr (argv[0], "podman") == NULL)
return false;
for (argc = 0; argv[argc]; argc++) for (argc = 0; argv[argc]; argc++)
{ {
if (argc == 0 || argv[argc][0] == '-') if (argc == 0 || argv[argc][0] == '-')