X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2Flibvlc%2Ftest.h;h=2a6c84b6e85b6fa48dcca730075998b4ddf9727e;hb=29a112b6d6f3bd52b0dd1c14161d0c1efb22f303;hp=e8aa06a8c518a315d8142514b467d931ad58a1d7;hpb=658686029ee756fbf4beb8e0cdcc4b0bc5dd18ed;p=vlc diff --git a/test/libvlc/test.h b/test/libvlc/test.h index e8aa06a8c5..2a6c84b6e8 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", @@ -72,35 +71,10 @@ 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 */ } #endif /* TEST_H */