From a034592c3c9599ee329525a75a5c9956e26f7f20 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Mon, 6 Jun 2022 12:07:15 -0400
Subject: [PATCH] Tests: test_session: include tap.h last
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

tap.h defines a number of macros that are very likely to clash with
other headers (e.g. ok, fail, etc.). On gcc 7.5.0, builds fail whenever
tap.h is included before an header that transitively includes
basic_ios.h.

This clash doesn't occur with more recent gcc releases (tested with 11.2
on my local machine).

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I62aaa14a6d1f20c77073ab2e481eddcb28fb78f3
---
 tests/unit/test_session.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test_session.cpp b/tests/unit/test_session.cpp
index 05c1f81b6..c19a1afdd 100644
--- a/tests/unit/test_session.cpp
+++ b/tests/unit/test_session.cpp
@@ -13,8 +13,6 @@
 #include <unistd.h>
 #include <urcu.h>
 
-#include <tap/tap.h>
-
 #include <bin/lttng-sessiond/health-sessiond.hpp>
 #include <bin/lttng-sessiond/session.hpp>
 #include <bin/lttng-sessiond/thread.hpp>
@@ -23,6 +21,8 @@
 #include <common/compat/errno.hpp>
 #include <common/sessiond-comm/sessiond-comm.hpp>
 
+#include <tap/tap.h>
+
 #define SESSION1 "test1"
 
 #define MAX_SESSIONS 10000
-- 
2.34.1