Merge remote-tracking branch 'origin/master' into 0.10

9 files changed, 10 insertions, 16 deletions

diff --git a/server/tests/README b/server/tests/README
index 477ca0ce..e44251de 100644
--- a/server/tests/README
+++ b/server/tests/README
@@ -14,11 +14,10 @@ test_just_sockets_no_ssl
  A complete server, only provides the main and inputs channels. Doesn't actually produce anything on the channels. Essentially a test of the regular link code (reds.c), good for multiple connect/disconnect tests.
 
 test_empty_success
- tests calling 
+ tests calling
 
 test_fail_on_null_core_interface
  should abort when run (when spice tries to watch_add)
 
 basic_event_loop.c
  used by test_just_sockets_no_ssl, can be used by other tests. very crude event loop. Should probably use libevent for better tests, but this is self contained.
-
diff --git a/server/tests/basic_event_loop.c b/server/tests/basic_event_loop.c
index e0cc06e6..c0ee705c 100644
--- a/server/tests/basic_event_loop.c
+++ b/server/tests/basic_event_loop.c
@@ -1,7 +1,7 @@
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/time.h>
-#include <strings.h>
 #include <signal.h>
 #include <string.h>
 
@@ -281,4 +281,3 @@ SpiceCoreInterface *basic_event_loop_init(void)
     ignore_sigpipe();
     return &core;
 }
-
diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c
index 81f942bc..ef5a543f 100644
--- a/server/tests/test_display_base.c
+++ b/server/tests/test_display_base.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
@@ -29,9 +30,7 @@ static void test_spice_destroy_update(SimpleSpiceUpdate *update)
     if (!update) {
         return;
     }
-    if (update->bitmap) {
-        free(update->bitmap);
-    }
+    free(update->bitmap);
     free(update);
 }
 
@@ -576,4 +575,3 @@ SpiceServer* test_init(SpiceCoreInterface *core)
     wakeup_timer = core->timer_add(do_wakeup, NULL);
     return server;
 }
-
diff --git a/server/tests/test_display_no_ssl.c b/server/tests/test_display_no_ssl.c
index 1eb83b37..a27bb001 100644
--- a/server/tests/test_display_no_ssl.c
+++ b/server/tests/test_display_no_ssl.c
@@ -6,6 +6,7 @@
  * existing ones in the test_display_base supplied queue.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include "test_display_base.h"
 
@@ -50,4 +51,3 @@ int main(void)
 
     return 0;
 }
-
diff --git a/server/tests/test_display_streaming.c b/server/tests/test_display_streaming.c
index b4025254..025541d6 100644
--- a/server/tests/test_display_streaming.c
+++ b/server/tests/test_display_streaming.c
@@ -4,6 +4,7 @@
  * TODO: stop updating same rect, check (prog) that stream stops
  */
 
+#include <config.h>
 #include "test_display_base.h"
 
 int simple_commands[] = {
@@ -24,4 +25,3 @@ int main(void)
     basic_event_loop_mainloop();
     return 0;
 }
-
diff --git a/server/tests/test_empty_success.c b/server/tests/test_empty_success.c
index 3641eb76..fb46aa89 100644
--- a/server/tests/test_empty_success.c
+++ b/server/tests/test_empty_success.c
@@ -1,5 +1,5 @@
+#include <config.h>
 #include <stdlib.h>
-#include <strings.h>
 #include <spice.h>
 
 SpiceTimer* timer_add(SpiceTimerFunc func, void *opaque)
@@ -57,4 +57,3 @@ int main(void)
 
     return 0;
 }
-
diff --git a/server/tests/test_fail_on_null_core_interface.c b/server/tests/test_fail_on_null_core_interface.c
index 6490a6a7..23261a26 100644
--- a/server/tests/test_fail_on_null_core_interface.c
+++ b/server/tests/test_fail_on_null_core_interface.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <spice.h>
 
 int main(void)
@@ -10,4 +11,3 @@ int main(void)
 
     return 0;
 }
-
diff --git a/server/tests/test_just_sockets_no_ssl.c b/server/tests/test_just_sockets_no_ssl.c
index afa3558b..ac5403b1 100644
--- a/server/tests/test_just_sockets_no_ssl.c
+++ b/server/tests/test_just_sockets_no_ssl.c
@@ -1,4 +1,4 @@
-#include <strings.h>
+#include <config.h>
 #include <sys/select.h>
 #include <spice.h>
 #include "basic_event_loop.h"
@@ -16,4 +16,3 @@ int main(void)
 
     return 0;
 }
-
diff --git a/server/tests/test_playback.c b/server/tests/test_playback.c
index 0b95bfdf..ed1b7667 100644
--- a/server/tests/test_playback.c
+++ b/server/tests/test_playback.c
@@ -1,5 +1,5 @@
+#include <config.h>
 #include <stdio.h>
-#include <strings.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <math.h>