[PATCH xorg-gtest 5/7] process: drop a few SCOPED_TRACE
Peter Hutterer
peter.hutterer at who-t.net
Thu Dec 13 17:17:38 PST 2012
SCOPED_TRACE will only print if the current scope fails and this can never
happen here. Change one message to standard printf, drop the others.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
src/process.cpp | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/process.cpp b/src/process.cpp
index 43ac0d6..af8b0f8 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -155,18 +155,15 @@ bool xorg::testing::Process::WaitForExit(unsigned int timeout) {
struct timespec sig_timeout = {timeout / 1000,
(timeout % 1000) * 1000000L};
- if (sigtimedwait(&sig_mask, NULL, &sig_timeout) != SIGCHLD && errno != EAGAIN) {
- SCOPED_TRACE("INFO: Failure waiting for SIGCHLD: " +
- std::string(strerror(errno)) + ". I slept instead.");
+ if (sigtimedwait(&sig_mask, NULL, &sig_timeout) != SIGCHLD && errno != EAGAIN)
usleep(timeout * 1000);
- }
if (!sigismember(&sig_mask, SIGCHLD)) {
if (sigprocmask(SIG_UNBLOCK, &sig_mask, NULL) == -1)
- SCOPED_TRACE("WARNING: Failed to unblock SIGCHLD. Tests may behave funny.\n");
+ std::cout << "WARNING: Failed to unblock SIGCHLD. Tests may behave funny.\n";
}
+
} else { /* oops, can't wait for SIGCHLD, sleep instead */
- SCOPED_TRACE("INFO: Failed to set SIGCHLD mask, sleeping instead.\n");
usleep(timeout * 1000);
}
--
1.8.0.2
More information about the xorg-devel
mailing list