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

native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc

Index: native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc b/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
index 417249720e9f957350feb856ae7d3783baeff407..05d9205cad050fd9283e2d1a90417fb4c0d2f3ac 100644
--- a/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
@@ -184,7 +184,7 @@ TEST_F(Html5FsTest, Mkdir) {
   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) {
@@ -388,8 +388,8 @@ TEST_F(Html5FsTest, GetStat) {
 
   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);
@@ -406,8 +406,8 @@ TEST_F(Html5FsTest, GetStat) {
   // 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);