From 4a8535f39d5c4f6f34534ea1dcf9f35cddbde0c7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 15 Jan 2010 10:26:20 -0800 Subject: [PATCH] tests: Improve error reporting for timeval test failures. --- tests/test-timeval.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/test-timeval.c b/tests/test-timeval.c index ba8b3d39..7aa6867a 100644 --- a/tests/test-timeval.c +++ b/tests/test-timeval.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,9 +55,16 @@ do_test(void) /* Wait up to 1 second. Using select() to do the timeout avoids * interfering with the interval timer. */ struct timeval timeout; + int retval; + timeout.tv_sec = 1; timeout.tv_usec = 0; - assert(select(0, NULL, NULL, NULL, &timeout) == -1 && errno == EINTR); + retval = select(0, NULL, NULL, NULL, &timeout); + if (retval != -1) { + ovs_fatal(0, "select returned %d", retval); + } else if (errno != EINTR) { + ovs_fatal(errno, "select reported unexpected error"); + } if (gettimeofday_in_msec() - start_gtod >= TIME_UPDATE_INTERVAL) { assert(time_msec() - start_time_msec >= TIME_UPDATE_INTERVAL); -- 2.30.2