Skip to content

Commit

Permalink
Make cli-test.sh pass on Linux.
Browse files Browse the repository at this point in the history
  • Loading branch information
glasser committed Dec 31, 2012
1 parent 238a785 commit eee3352
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions admin/cli-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ echo "... run"
MONGOMARK='--bind_ip 127.0.0.1 --smallfiles --port 9102'
# kill any old test meteor
# there is probably a better way to do this, but it is at least portable across macos and linux
ps ax | grep -e 'meteor.js -p 9100' | grep -v grep | awk '{print $1}' | xargs kill
# (the || true is needed on linux, whose xargs will invoke kill even with no args)
ps ax | grep -e 'meteor.js -p 9100' | grep -v grep | awk '{print $1}' | xargs kill || true

! $METEOR mongo > /dev/null 2>&1
$METEOR reset > /dev/null 2>&1
Expand Down Expand Up @@ -117,7 +118,7 @@ ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
curl -s "http://localhost:$PORT" > /dev/null

kill $METEOR_PID
ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill
ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill || true

echo "... mongo message"

Expand Down

0 comments on commit eee3352

Please sign in to comment.