[NaCl SDK] nacl_io: Fix utime() on directories.

native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc

Index: native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc b/native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc
index e0833ceecca0d913264cf123ff759ad602756fca..ca0b45375d8a24b68a0349f7adff58d03e928d73 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc
@@ -289,8 +289,8 @@ TEST_F(FuseFsTest, CreateWithMode) {
   ASSERT_EQ(0, fs_.OpenWithMode(Path("/hello"),
                                 O_RDWR | O_CREAT, 0723, &node));
   EXPECT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(S_IFREG, statbuf.st_mode & S_IFMT);
-  EXPECT_EQ(0723, statbuf.st_mode & ~S_IFMT);
+  EXPECT_TRUE(S_ISREG(statbuf.st_mode));
+  EXPECT_EQ(0723, statbuf.st_mode & 0777);
 }
 
 TEST_F(FuseFsTest, CreateAndWrite) {
@@ -317,20 +317,20 @@ TEST_F(FuseFsTest, GetStat) {
 
   ASSERT_EQ(0, fs_.Open(Path("/hello"), O_RDONLY, &node));
   EXPECT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(S_IFREG, statbuf.st_mode & S_IFMT);
-  EXPECT_EQ(0666, statbuf.st_mode & ~S_IFMT);
+  EXPECT_TRUE(S_ISREG(statbuf.st_mode));
+  EXPECT_EQ(0666, statbuf.st_mode & 0777);
   EXPECT_EQ(strlen(hello_world), statbuf.st_size);
 
   ASSERT_EQ(0, fs_.Open(Path("/"), O_RDONLY, &node));
   EXPECT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(S_IFDIR, statbuf.st_mode & S_IFMT);
-  EXPECT_EQ(0755, statbuf.st_mode & ~S_IFMT);
+  EXPECT_TRUE(S_ISDIR(statbuf.st_mode));
+  EXPECT_EQ(0755, statbuf.st_mode & 0777);
 
   // Create a file and stat.
   ASSERT_EQ(0, fs_.Open(Path("/foobar"), O_RDWR | O_CREAT, &node));
   EXPECT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(S_IFREG, statbuf.st_mode & S_IFMT);
-  EXPECT_EQ(0666, statbuf.st_mode & ~S_IFMT);
+  EXPECT_TRUE(S_ISREG(statbuf.st_mode));
+  EXPECT_EQ(0666, statbuf.st_mode & 0777);
   EXPECT_EQ(0, statbuf.st_size);
 }
 
@@ -394,12 +394,12 @@ TEST_F(FuseFsTest, Fchmod) {
 
   ASSERT_EQ(0, fs_.Open(Path("/hello"), O_RDONLY, &node));
   ASSERT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(0666, statbuf.st_mode & ~S_IFMT);
+  EXPECT_EQ(0666, statbuf.st_mode & 0777);
 
   ASSERT_EQ(0, node->Fchmod(0777));
 
   ASSERT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(0777, statbuf.st_mode & ~S_IFMT);
+  EXPECT_EQ(0777, statbuf.st_mode & 0777);
 }
 
 namespace {