lkml.org 
[lkml]   [2019]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 17/78] selftests: rtc: rtctest: fix alarm tests
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit fdac94489c4d247088b3885875b39b3e1eb621ef ]

    Return values for select are not checked properly and timeouts may not be
    detected.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Shuah Khan <shuah@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/rtc/rtctest.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c
    index e20b017e70731..dea4e3d6d9e18 100644
    --- a/tools/testing/selftests/rtc/rtctest.c
    +++ b/tools/testing/selftests/rtc/rtctest.c
    @@ -145,15 +145,12 @@ TEST_F(rtc, alarm_alm_set) {

    rc = select(self->fd + 1, &readfds, NULL, NULL, &tv);
    ASSERT_NE(-1, rc);
    - EXPECT_NE(0, rc);
    + ASSERT_NE(0, rc);

    /* Disable alarm interrupts */
    rc = ioctl(self->fd, RTC_AIE_OFF, 0);
    ASSERT_NE(-1, rc);

    - if (rc == 0)
    - return;
    -
    rc = read(self->fd, &data, sizeof(unsigned long));
    ASSERT_NE(-1, rc);
    TH_LOG("data: %lx", data);
    @@ -202,7 +199,7 @@ TEST_F(rtc, alarm_wkalm_set) {

    rc = select(self->fd + 1, &readfds, NULL, NULL, &tv);
    ASSERT_NE(-1, rc);
    - EXPECT_NE(0, rc);
    + ASSERT_NE(0, rc);

    rc = read(self->fd, &data, sizeof(unsigned long));
    ASSERT_NE(-1, rc);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-04 09:45    [W:4.154 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site