nacl_io: Remove the direct syscall intercept for 'remove'

native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc

 // Copyright (c) 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.
 
 // The linux/mac host build of nacl_io can't do wrapping of syscalls so all
 // these tests must be disabled.
 #if !defined(__linux__) && !defined(__APPLE__)
 
 #include <unistd.h>
 
@@ skipping 492 matching lines @@
 
   EXPECT_CALL(mock, readlink(kDummyConstChar, buf, 10))
       .WillOnce(Return(kDummyInt))
       .WillOnce(DoAll(SetErrno(kDummyErrno), Return(-1)));
 
   EXPECT_EQ(kDummyInt, readlink(kDummyConstChar, buf, 10));
   EXPECT_EQ(-1, readlink(kDummyConstChar, buf, 10));
   ASSERT_EQ(kDummyErrno, errno);
 }
 
-#ifdef __GLIBC__
-// Under newlib there is no remove syscall.  Instead it is implemented
-// in terms of unlink()/rmdir().
 TEST_F(KernelWrapTest, remove) {
-  EXPECT_CALL(mock, remove(kDummyConstChar)).WillOnce(Return(-1));
+  // The remove syscall is not directly intercepted. Instead it is implemented
+  // in terms of unlink()/rmdir().
+  EXPECT_CALL(mock, unlink(kDummyConstChar))
+       .WillOnce(DoAll(SetErrno(kDummyErrno), Return(-1)));
   EXPECT_EQ(-1, remove(kDummyConstChar));
 }
-#endif
 
 TEST_F(KernelWrapTest, rename) {
   EXPECT_CALL(mock, rename(kDummyConstChar, kDummyConstChar2))
       .WillOnce(Return(0))
       .WillOnce(DoAll(SetErrno(kDummyErrno), Return(-1)));
 
   EXPECT_EQ(0, rename(kDummyConstChar, kDummyConstChar2));
   EXPECT_EQ(-1, rename(kDummyConstChar, kDummyConstChar2));
   ASSERT_EQ(kDummyErrno, errno);
 }
@@ skipping 389 matching lines @@
       .WillOnce(Return(0))
       .WillOnce(DoAll(SetErrno(kDummyErrno), Return(-1)));
   EXPECT_EQ(0, socketpair(kDummyInt, kDummyInt2, kDummyInt3, &dummy_val));
   EXPECT_EQ(-1, socketpair(kDummyInt, kDummyInt2, kDummyInt3, &dummy_val));
   EXPECT_EQ(kDummyErrno, errno);
 }
 
 #endif  // PROVIDES_SOCKET_API
 
 #endif  // __linux__