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

native_client_sdk/src/tests/nacl_io_test/html5_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 <errno.h>
 #include <fcntl.h>
 
 #include <set>
 #include <string>
 
@@ skipping 166 matching lines @@
   EXPECT_EQ(EEXIST, fs->Mkdir(Path("/"), 0644));
 
   Path path("/foo");
   ASSERT_FALSE(fs->Exists("/foo"));
   ASSERT_EQ(0, fs->Mkdir(path, 0644));
 
   struct stat stat;
   ScopedNode node;
   ASSERT_EQ(0, fs->Open(path, O_RDONLY, &node));
   EXPECT_EQ(0, node->GetStat(&stat));
-  EXPECT_EQ(S_IFDIR, stat.st_mode & S_IFDIR);
+  EXPECT_TRUE(S_ISDIR(stat.st_mode));
 }
 
 TEST_F(Html5FsTest, Remove) {
   const char* kPath = "/foo";
   EXPECT_TRUE(ppapi_html5_.filesystem_template()->AddEmptyFile(kPath, NULL));
 
   StringMap_t map;
   ScopedRef<Html5FsForTesting> fs(new Html5FsForTesting(map, &ppapi_));
 
   Path path(kPath);
@@ skipping 183 matching lines @@
   fake_node->set_last_modified_time(modified_time);
 
   StringMap_t map;
   ScopedRef<Html5FsForTesting> fs(new Html5FsForTesting(map, &ppapi_));
 
   ScopedNode node;
   ASSERT_EQ(0, fs->Open(Path("/file"), O_RDONLY, &node));
 
   struct stat statbuf;
   EXPECT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(S_IFREG, statbuf.st_mode & S_IFMT);
-  EXPECT_EQ(S_IRALL | S_IWALL | S_IXALL, statbuf.st_mode & ~S_IFMT);
+  EXPECT_TRUE(S_ISREG(statbuf.st_mode));
+  EXPECT_EQ(S_IRALL | S_IWALL | S_IXALL, statbuf.st_mode & 0777);
   EXPECT_EQ(strlen(contents), statbuf.st_size);
   EXPECT_EQ(access_time, statbuf.st_atime);
   EXPECT_EQ(creation_time, statbuf.st_ctime);
   EXPECT_EQ(modified_time, statbuf.st_mtime);
 
   // Test Get* and Isa* methods.
   off_t size;
   EXPECT_EQ(0, node->GetSize(&size));
   EXPECT_EQ(strlen(contents), size);
   EXPECT_FALSE(node->IsaDir());
   EXPECT_TRUE(node->IsaFile());
   EXPECT_EQ(ENOTTY, node->Isatty());
 
   // GetStat on a directory...
   EXPECT_EQ(0, fs->Open(Path("/dir"), O_RDONLY, &node));
   EXPECT_EQ(0, node->GetStat(&statbuf));
-  EXPECT_EQ(S_IFDIR, statbuf.st_mode & S_IFMT);
-  EXPECT_EQ(S_IRALL | S_IWALL | S_IXALL, statbuf.st_mode & ~S_IFMT);
+  EXPECT_TRUE(S_ISDIR(statbuf.st_mode));
+  EXPECT_EQ(S_IRALL | S_IWALL | S_IXALL, statbuf.st_mode & 0777);
   EXPECT_EQ(0, statbuf.st_size);
   EXPECT_EQ(access_time, statbuf.st_atime);
   EXPECT_EQ(creation_time, statbuf.st_ctime);
   EXPECT_EQ(modified_time, statbuf.st_mtime);
 
   // Test Get* and Isa* methods.
   EXPECT_EQ(0, node->GetSize(&size));
   EXPECT_EQ(0, size);
   EXPECT_TRUE(node->IsaDir());
   EXPECT_FALSE(node->IsaFile());
@@ skipping 117 matching lines @@
         EXPECT_EQ(dirents[i].d_ino, file2_ino);
       }
     }
 
     EXPECT_EQ(1, dirnames.count("file"));
     EXPECT_EQ(1, dirnames.count("file2"));
     EXPECT_EQ(1, dirnames.count("."));
     EXPECT_EQ(1, dirnames.count(".."));
   }
 }