summaryrefslogtreecommitdiff
diff options
authorMichael Vogt <mvo@ubuntu.com>2016-06-16 12:34:53 +0200
committerMichael Vogt <mvo@ubuntu.com>2016-06-16 12:34:53 +0200
commit9e021aa7cb5ea24e0897363d0abd33333468b39e (patch)
treebee681a253f266861d1ae58d5e9b29161375add5
parent9cea0b4cb706e29ea162348c41cb316befff3cb8 (diff)
add missing mkdirfeature/snap-run2.2
-rw-r--r--cmd/snap/main.go2
-rw-r--r--tests/snap-run-symlink-error/task.yaml1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/snap/main.go b/cmd/snap/main.go
index e660e5d02b..0e46416567 100644
--- a/cmd/snap/main.go
+++ b/cmd/snap/main.go
@@ -169,7 +169,7 @@ func main() {
cmd.Positional.SnapApp = snapApp
// this will call syscall.Exec() so it does not return
// *unless* there is an error, i.e. we setup a wrong
- // symlink
+ // symlink (or syscall.Exec() fails for strange reasons)
err := cmd.Execute(os.Args[1:])
fmt.Fprintf(Stderr, "internal error, please report: running %q failed: %s\n", snapApp, err)
os.Exit(46)
diff --git a/tests/snap-run-symlink-error/task.yaml b/tests/snap-run-symlink-error/task.yaml
index 9ab18eac31..1d007df8e8 100644
--- a/tests/snap-run-symlink-error/task.yaml
+++ b/tests/snap-run-symlink-error/task.yaml
@@ -12,6 +12,7 @@ execute: |
# FIXME: remove "SNAP_REEXEC" once we have `snap run` inside the os snap
export SNAP_REEXEC=0
echo Setting up incorrect symlink for snap run
+ sudo mkdir -p /snap/bin
sudo ln -s /usr/bin/snap /snap/bin/xxx
echo Running unknown command
expected='internal error, please report: running "xxx" failed: cannot find snap "xxx"'