Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Add check for curl command to active-http.test

I've moved the check from TEST-EXEC to TEST-REQUIRES. I think it's
fine to just skip the test if curl is not available.
This commit is contained in:
Robin Sommer 2013-10-14 09:26:09 -07:00
commit 2e05978210
3 changed files with 6 additions and 1 deletions

View file

@ -1,4 +1,5 @@
# @TEST-REQUIRES: which python
# @TEST-REQUIRES: which curl
#
# @TEST-EXEC: btest-bg-run httpd python $SCRIPTS/httpd.py --max 1
# @TEST-EXEC: sleep 3