Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / tests / utils / utils.c

diff --git a/tests/utils/utils.c b/tests/utils/utils.c
index c31417efbbc2190c6055ab786853e5de3496c933..fee74e961245d02e0322f70c86c9e7d21e33cd43 100644 (file)
--- a/tests/utils/utils.c
+++ b/tests/utils/utils.c
@@ -1,24 +1,12 @@
 /*
- * Copyright (C) - 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; version 2.1 of the License.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <assert.h>
 #include <common/compat/time.h>
 #include <common/time.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <stdbool.h>
@@ -29,6 +17,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <common/compat/errno.h>
+#include <common/macros.h>
+
 #include "utils.h"
 
 static inline
@@ -36,7 +27,7 @@ int64_t elapsed_time_ns(struct timespec *t1, struct timespec *t2)
 {
        struct timespec delta;
 
-       assert(t1 && t2);
+       LTTNG_ASSERT(t1 && t2);
        delta.tv_sec = t2->tv_sec - t1->tv_sec;
        delta.tv_nsec = t2->tv_nsec - t1->tv_nsec;
        return ((int64_t) NSEC_PER_SEC * (int64_t) delta.tv_sec) +