Merge pull request mozilla-b2g#10466 from Rik/no-multiprocess-884338

Bug 884338 - Travis no likey multiprocess :( r=kaze
andreasgal · Jun 18, 2013 · e007ece · e007ece
2 parents fd74493 + 7ece998
commit e007ece
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -634,7 +634,7 @@ endif
 
 # Lint apps
 lint:
-	gjslint --multiprocess --nojsdoc -r apps -r shared -e '$(shell cat ./build/lint-excluded-dirs.list)' -x '$(shell cat ./build/lint-excluded-files.list)'
+	gjslint --nojsdoc -r apps -r shared -e '$(shell cat ./build/lint-excluded-dirs.list)' -x '$(shell cat ./build/lint-excluded-files.list)'
 
 # Erase all the indexedDB databases on the phone, so apps have to rebuild them.
 delete-databases:

diff --git a/tools/pre-commit b/tools/pre-commit
@@ -21,4 +21,4 @@ done
 
 diff_with_exclude=`git diff --staged --name-only|grep -v $grep_exclude`
 
-gjslint --multiprocess --nojsdoc -x '`cat ./build/lint-excluded-files.list`' $diff_with_exclude
+gjslint --nojsdoc -x '`cat ./build/lint-excluded-files.list`' $diff_with_exclude