Merging upstream version 3.5.5 (Closes: #1098233).

Signed-off-by: Daniel Baumann <daniel@debian.org>

tests/test_client_thread.c

@@ -12,6 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
+#define _GNU_SOURCE
+
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,8 +24,7 @@
 
 #include <libyang/libyang.h>
 
-#include <session_client.h>
-#include "tests/config.h"
+#include "ln2_test.h"
 
 #define nc_assert(cond) if (!(cond)) { fprintf(stderr, "assert failed (%s:%d)\n", __FILE__, __LINE__); exit(1); }
 
@@ -51,8 +52,6 @@ main(void)
     pthread_t t;
     int r;
 
-    nc_client_init();
-
     /*
      * TEST sharing the thread context
      */