Put timeout to the testsuite

diff --git a/src/control/core.c b/src/control/core.c
index a079e2e6bfb6e4c9cdfe4394341d4d0084376994..9a49dab1147567992791b27b1f2e9e73d8633ea4 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -84,6 +84,9 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
 {
     libvlc_instance_t *p_new;
 
+    for (int i = 0; i < argc; i++)
+        printf ("%d: %s\n", i, argv[i]);
+
     libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
     if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
 

diff --git a/src/control/testapi.c b/src/control/testapi.c
index 96887baab39762cb5f163a026e981c6872bbdfca..a6f32574d39089574763eb9a7f62693b6e040d43 100644 (file)
--- a/src/control/testapi.c
+++ b/src/control/testapi.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 static libvlc_exception_t ex;
 
@@ -49,9 +50,11 @@ int main (int argc, char *argv[])
     libvlc_instance_t *vlc;
     const char *args[argc + 3];
 
-    args[0] = "-I";
-    args[1] = "dummy";
-    args[2] = "-vvv";
+    alarm (30); /* Make sure "make check" does not get stuck */
+
+    args[0] = "-vvv";
+    args[1] = "-I";
+    args[2] = "-dummy";
     args[3] = "--plugin-path=..";
     for (int i = 1; i < argc; i++)
         args[i + 3] = argv[i];