Non-SFI mode: SCONS_NONSFI_TC clean up.

tests/mmap/mmap_test.cc

 /*
  * Copyright (c) 2012 The Native Client 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 <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ skipping 208 matching lines @@
 }
 
 /*
  *   Verify that mmap into the NULL pointer guard page will fail.
  */
 
 bool test3() {
   void  *res;
 
   printf("test3\n");
+  if (NONSFI_MODE) {
+    /*
+     * This test is designed to made sure NaClSyscall mmap's behavior returns

[Mark Seaborn, 2014/07/25 20:54:54]

"make sure"

How about: "This test checks a security property of the NaCl TCB.  However, when
calling Linux's mmap() syscall directly, we can't necessarily expect a specific
error value for this case."

[hidehiko, 2014/07/28 22:11:05]

Done.

+     * an appropriate error. So, we skip it in non-SFI mode.
+     */
+    printf("test3 skipped\n");
+    return true;
+  }
+
   res = mmap(static_cast<void*>(0), (size_t) (1 << 16),
              PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0);
   printf("res = %p\n", res);
-  const int kExpectedErrno = NONSFI_MODE ? EPERM : EINVAL;
-  if (MAP_FAILED == res && kExpectedErrno == errno) {
+  if (MAP_FAILED == res) {
+    printf("errno = %d\n", errno);
+  }
+  if (MAP_FAILED == res && EINVAL == errno) {
     printf("mmap okay\n");
     return true;
   }
   printf("mmap should not have succeeded, or failed with wrong error\n");
   return false;
 }
 
 /*
  *   Verify that mmap/MAP_FIXED with a non-page-aligned address will fail.
  */
@@ skipping 326 matching lines @@
   // run the full test suite
   passed = testSuite();
 
   if (passed) {
     printf("All tests PASSED\n");
     exit(0);
   }
   printf("One or more tests FAILED\n");
   exit(-1);
 }