exit if spice_server_init fails (socket already in use?)

diff --git a/Makefile b/Makefile
index aab486088ce5cca9c0cda7b0df1a42dc8af70af1..84f359c76ff7c02ac137b78dda3ad5158b47a42f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,3 +7,7 @@ all: ${PROGRAMS}
 
 test_display_no_ssl: ${SOURCES} ${HEADERS}
        gcc ${SOURCES} -o $@ $(shell pkg-config --cflags --libs spice-protocol,spice-server)
+
+.PHONY: test
+test: test_display_no_ssl
+       ./test_display_no_ssl & remote-viewer spice://localhost:5912

diff --git a/test_display_base.c b/test_display_base.c
index 7e314eb4d8fc1052f86547bdc4e1024215e3d1ab..5cee77118d7f9e5d83698f91040bd6eb55c0c58a 100644 (file)
--- a/test_display_base.c
+++ b/test_display_base.c
@@ -861,7 +861,10 @@ Test *test_new(SpiceCoreInterface *core)
     printf("TESTER: listening on port %d (unsecure)\n", port);
     spice_server_set_port(server, port);
     spice_server_set_noauth(server);
-    spice_server_init(server, core);
+    int res = spice_server_init(server, core);
+    if (res != 0) {
+        g_error("spice_server_init failed, res = %d\n", res);
+    }
 
     cursor_init();
     path_init(&path, 0, angle_parts);

diff --git a/test_display_no_ssl.c b/test_display_no_ssl.c
index 4a7babf89a03165614bcbcec1f0481df8995944e..5359e66ef90e9579aa20fd47db06e32036ed9b23 100644 (file)
--- a/test_display_no_ssl.c
+++ b/test_display_no_ssl.c
@@ -7,19 +7,17 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include "test_display_base.h"
 
 SpiceCoreInterface *core;
 SpiceTimer *ping_timer;
 
-void show_channels(SpiceServer *server);
-
-int ping_ms = 100;
+int ping_ms = 1000;
 
 void pinger(void *opaque)
 {
-    // show_channels is not thread safe - fails if disconnections / connections occur
-    //show_channels(server);
+    printf("TEST PINGER\n");
 
     core->timer_start(ping_timer, ping_ms);
 }