Merge branch 'v0.6'

This commit is contained in:
Ben Noordhuis 2011-12-12 02:15:45 +01:00
commit bfd51ca022
5 changed files with 14 additions and 2 deletions

2
.gitignore vendored
View File

@ -7,6 +7,8 @@
*.orig
*.sdf
*.suo
core
vgcore.*
/out/
/build/gyp

9
.travis.yml Normal file
View File

@ -0,0 +1,9 @@
language: node_js
script:
- "make test"
notifications:
email: false
irc:
- "irc.freenode.net#libuv"

View File

@ -36,3 +36,4 @@ Tj Holowaychuk <tj@vision-media.ca>
Shimon Doodkin <helpmepro1@gmail.com>
Ryan Emery <seebees@gmail.com>
Bruce Mitchener <bruce.mitchener@gmail.com>
Maciej Małecki <maciej.malecki@notimplemented.org>

View File

@ -1,4 +1,4 @@
# libuv
# libuv [![Build Status](https://secure.travis-ci.org/joyent/libuv.png)](http://travis-ci.org/joyent/libuv)
libuv is a new platform layer for Node. Its purpose is to abstract IOCP on
Windows and libev on Unix systems. We intend to eventually contain all

View File

@ -71,7 +71,7 @@ int run_tests(int timeout, int benchmark_output) {
log_progress(total, passed, failed, "Done.\n");
}
return 0;
return failed;
}