Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / test / libvlc / test.h

diff --git a/test/libvlc/test.h b/test/libvlc/test.h
index 319318d66576dcbbf0af9005faab9e05daf82e11..2a6c84b6e85b6fa48dcca730075998b4ddf9727e 100644 (file)
--- 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",
@@ -72,31 +71,6 @@ 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 */