X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2Flibvlc%2Ftest.h;h=fc41f51582bc03b25ada367d2591405c2f3f576e;hb=97c36f8d7f2014921a74c75244860224fef18b74;hp=e8aa06a8c518a315d8142514b467d931ad58a1d7;hpb=4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b;p=vlc

diff --git a/test/libvlc/test.h b/test/libvlc/test.h
index e8aa06a8c5..fc41f51582 100644
--- a/test/libvlc/test.h
+++ b/test/libvlc/test.h
@@ -46,7 +46,6 @@
 /*********************************************************************
  * Some useful global var
  */
-static libvlc_exception_t ex;
 
 static const char * test_defaults_args[] = {
     "-v",
@@ -54,7 +53,6 @@ static const char * test_defaults_args[] = {
     "-I",
     "dummy",
     "--no-media-library",
-    "--plugin-path=../modules",
     "--vout=dummy",
     "--aout=dummy"
 };
@@ -72,35 +70,11 @@ static const char test_default_sample[] = SRCDIR"/samples/empty.voc";
 
 #define log( ... ) printf( "testapi: " __VA_ARGS__ );
 
-/* test if we have exception */
-static inline bool have_exception (void)
-{
-    if (libvlc_exception_raised (&ex))
-    {
-        libvlc_exception_clear (&ex);
-        return true;
-    }
-    else
-        return false;
-}
-
-static inline void catch (void)
-{
-    if (libvlc_exception_raised (&ex))
-    {
-         fprintf (stderr, "Exception: %s\n",
-                  libvlc_exception_get_message (&ex));
-         abort ();
-    }
-
-    assert (libvlc_exception_get_message (&ex) == NULL);
-    libvlc_exception_clear (&ex);
-}
-
 static inline void test_init (void)
 {
     (void)test_default_sample; /* This one may not be used */
-    alarm (50); /* Make sure "make check" does not get stuck */
+    alarm (10); /* Make sure "make check" does not get stuck */
+    setenv( "VLC_PLUGIN_PATH", "../modules", 1 );
 }
 
 #endif /* TEST_H */