diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-07-30 23:32:53 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-07-30 23:33:45 +0200 |
commit | 3ff2cbc892ce2d6aa01a986963f8437b8070b085 (patch) | |
tree | 84efdd2a7462daad3d2ea79bbeea647ad4f67ce9 /deps/uv/test | |
parent | 4cc57b4aca65ea86f4e42ddaeadfa796db239719 (diff) | |
download | node-new-3ff2cbc892ce2d6aa01a986963f8437b8070b085.tar.gz |
deps: upgrade libuv to joyent/libuv@4bdb7d8
Non-release upgrade so pending patches can land.
Diffstat (limited to 'deps/uv/test')
-rw-r--r-- | deps/uv/test/test-fs.c | 22 | ||||
-rw-r--r-- | deps/uv/test/test-platform-output.c | 8 |
2 files changed, 19 insertions, 11 deletions
diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c index 34f8afe228..5e02237179 100644 --- a/deps/uv/test/test-fs.c +++ b/deps/uv/test/test-fs.c @@ -104,7 +104,7 @@ static char buf[32]; static char test_buf[] = "test-buffer\n"; -static void check_permission(const char* filename, int mode) { +static void check_permission(const char* filename, unsigned int mode) { int r; uv_fs_t req; uv_stat_t* s; @@ -925,16 +925,16 @@ TEST_IMPL(fs_fstat) { r = fstat(file, &t); ASSERT(r == 0); - ASSERT(s->st_dev == t.st_dev); - ASSERT(s->st_mode == t.st_mode); - ASSERT(s->st_nlink == t.st_nlink); - ASSERT(s->st_uid == t.st_uid); - ASSERT(s->st_gid == t.st_gid); - ASSERT(s->st_rdev == t.st_rdev); - ASSERT(s->st_ino == t.st_ino); - ASSERT(s->st_size == t.st_size); - ASSERT(s->st_blksize == t.st_blksize); - ASSERT(s->st_blocks == t.st_blocks); + ASSERT(s->st_dev == (uint64_t) t.st_dev); + ASSERT(s->st_mode == (uint64_t) t.st_mode); + ASSERT(s->st_nlink == (uint64_t) t.st_nlink); + ASSERT(s->st_uid == (uint64_t) t.st_uid); + ASSERT(s->st_gid == (uint64_t) t.st_gid); + ASSERT(s->st_rdev == (uint64_t) t.st_rdev); + ASSERT(s->st_ino == (uint64_t) t.st_ino); + ASSERT(s->st_size == (uint64_t) t.st_size); + ASSERT(s->st_blksize == (uint64_t) t.st_blksize); + ASSERT(s->st_blocks == (uint64_t) t.st_blocks); #if defined(__APPLE__) ASSERT(s->st_atim.tv_sec == t.st_atimespec.tv_sec); ASSERT(s->st_atim.tv_nsec == t.st_atimespec.tv_nsec); diff --git a/deps/uv/test/test-platform-output.c b/deps/uv/test/test-platform-output.c index 4e029e4fb3..d2104f40a1 100644 --- a/deps/uv/test/test-platform-output.c +++ b/deps/uv/test/test-platform-output.c @@ -72,6 +72,14 @@ TEST_IMPL(platform_output) { for (i = 0; i < count; i++) { printf(" name: %s\n", interfaces[i].name); printf(" internal: %d\n", interfaces[i].is_internal); + printf(" physical address: "); + printf("%02x:%02x:%02x:%02x:%02x:%02x\n", + (unsigned char)interfaces[i].phys_addr[0], + (unsigned char)interfaces[i].phys_addr[1], + (unsigned char)interfaces[i].phys_addr[2], + (unsigned char)interfaces[i].phys_addr[3], + (unsigned char)interfaces[i].phys_addr[4], + (unsigned char)interfaces[i].phys_addr[5]); if (interfaces[i].address.address4.sin_family == AF_INET) { uv_ip4_name(&interfaces[i].address.address4, buffer, sizeof(buffer)); |