Midori Web Browser

Merge lp:~gue5t/midori/test-return into lp:midori

  1. test-return
  2. Merge into trunk
Proposed by gue5t gue5t
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6938
Merged at revision: 6939
Proposed branch: lp:~gue5t/midori/test-return
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
tests/license.sh (+1/-1)
To merge this branch: bzr merge lp:~gue5t/midori/test-return
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+256758@code.launchpad.net

Commit message

use exit instead of return in license script

Description of the change

The script license.sh in tests/ contains a "return 0" statement which is illegal outside of function definition context. This changes it to do "exit 0" which seems to be what was intended.

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/license.sh'
2--- tests/license.sh 2013-12-12 18:53:23 +0000
3+++ tests/license.sh 2015-04-19 14:52:28 +0000
4@@ -6,7 +6,7 @@
5 # License as published by the Free Software Foundation; either
6 # version 2.1 of the License, or (at your option) any later version.
7 echo Running 'licensecheck'
8-test -z $(which licensecheck) && echo ...SKIPPED: not installed && return 0
9+test -z $(which licensecheck) && echo ...SKIPPED: not installed && exit 0
10 test -n "$SRCDIR" && cd $SRCDIR
11 test -z "$BLDDIR" && BLDDIR=_build
12 find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./_*/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1

Subscribers

People subscribed via source and target branches

to all changes: