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

native_client_sdk/src/tests/nacl_io_test/fuse_fs_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <fcntl.h>
 
 #include <gtest/gtest.h>
 
 #include <string>
 #include <vector>
@@ skipping 271 matching lines @@
   ASSERT_STREQ("World!\n", buffer);
 }
 
 TEST_F(FuseFsTest, CreateWithMode) {
   ScopedNode node;
   struct stat statbuf;
 
   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) {
   ScopedNode node;
   ASSERT_EQ(0, fs_.Open(Path("/foobar"), O_RDWR | O_CREAT, &node));
 
   HandleAttr attr;
   const char message[] = "Something interesting";
   int bytes_written;
   ASSERT_EQ(0, node->Write(attr, &message[0], strlen(message), &bytes_written));
   ASSERT_EQ(bytes_written, strlen(message));
 
   // Now try to read the data back.
   char buffer[40] = {0};
   int bytes_read = 0;
   ASSERT_EQ(0, node->Read(attr, &buffer[0], sizeof(buffer), &bytes_read));
   ASSERT_EQ(strlen(message), bytes_read);
   ASSERT_STREQ(message, buffer);
 }
 
 TEST_F(FuseFsTest, GetStat) {
   struct stat statbuf;
   ScopedNode node;
 
   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);
 }
 
 TEST_F(FuseFsTest, GetDents) {
   ScopedNode root;
 
   ASSERT_EQ(0, fs_.Open(Path("/"), O_RDONLY, &root));
 
   struct dirent entries[4];
   int bytes_read;
@@ skipping 43 matching lines @@
   EXPECT_EQ(times[1].tv_sec, statbuf.st_mtime);
   EXPECT_EQ(times[1].tv_nsec, statbuf.st_mtimensec);
 }
 
 TEST_F(FuseFsTest, Fchmod) {
   struct stat statbuf;
   ScopedNode node;
 
   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 {
 
 class KernelProxyFuseTest : public ::testing::Test {
  public:
   KernelProxyFuseTest() {}
 
   void SetUp();
   void TearDown();
@@ skipping 32 matching lines @@
   // Then read it back in.
   fd = ki_open("/hello", O_RDONLY, 0);
   ASSERT_GT(fd, -1);
 
   char buffer[30];
   memset(buffer, 0, sizeof(buffer));
   ASSERT_EQ(sizeof(hello_world), ki_read(fd, buffer, sizeof(buffer)));
   EXPECT_STREQ(hello_world, buffer);
   EXPECT_EQ(0, ki_close(fd));
 }