Merge "support _POSIX_REALTIME_SIGNALS"
authorYabin Cui <yabinc@google.com>
Tue, 9 Dec 2014 20:10:19 +0000 (20:10 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 Dec 2014 20:10:19 +0000 (20:10 +0000)
1  2 
libc/Android.mk
libc/SYSCALLS.TXT
libc/include/machine/posix_limits.h
tests/unistd_test.cpp

diff --cc libc/Android.mk
Simple merge
Simple merge
Simple merge
index fd27682db45c06e14c323403e2fa44e4fc4adad9,433c1b501694af0fd683519ef2999dcfab616c06..96d66e48d6ff061b54413075f38cc38dc5574852
@@@ -612,12 -611,13 +613,11 @@@ TEST(unistd, _POSIX_macros_smoke) 
  
  #if defined(__BIONIC__)
    // These tests only pass on bionic, as bionic and glibc has different support on these macros.
 -  // Macros like _POSIX_ADVISORY_INFO are not supported on bionic yet.
 -  EXPECT_EQ(-1, _POSIX_ADVISORY_INFO);
 +  // Macros like _POSIX_ASYNCHRONOUS_IO are not supported on bionic yet.
    EXPECT_EQ(-1, _POSIX_ASYNCHRONOUS_IO);
    EXPECT_EQ(-1, _POSIX_BARRIERS);
 -  EXPECT_EQ(-1, _POSIX_CPUTIME);
    EXPECT_EQ(-1, _POSIX_MESSAGE_PASSING);
    EXPECT_EQ(-1, _POSIX_PRIORITIZED_IO);
-   EXPECT_EQ(-1, _POSIX_REALTIME_SIGNALS);
    EXPECT_EQ(-1, _POSIX_SHARED_MEMORY_OBJECTS);
    EXPECT_EQ(-1, _POSIX_SPAWN);
    EXPECT_EQ(-1, _POSIX_SPIN_LOCKS);
@@@ -774,11 -773,12 +775,10 @@@ TEST(unistd, sysconf) 
  #if defined(__BIONIC__)
    // Tests can only run on bionic, as bionic and glibc have different support for these options.
    // Below options are not supported on bionic yet.
 -  VERIFY_SYSCONF_NOT_SUPPORT(_SC_ADVISORY_INFO);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_ASYNCHRONOUS_IO);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_BARRIERS);
 -  VERIFY_SYSCONF_NOT_SUPPORT(_SC_CPUTIME);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_MESSAGE_PASSING);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_PRIORITIZED_IO);
-   VERIFY_SYSCONF_NOT_SUPPORT(_SC_REALTIME_SIGNALS);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_SHARED_MEMORY_OBJECTS);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_SPAWN);
    VERIFY_SYSCONF_NOT_SUPPORT(_SC_SPIN_LOCKS);