From 07ebb7349a571adf8201189f7404190c56b02cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 16 Apr 2008 09:48:06 +0000 Subject: [PATCH] tests/check/elements/ofa.c: Only check if the generated fingerprints are valid Base64. The fingerprints are different... Original commit message from CVS: * tests/check/elements/ofa.c: (bus_handler), (GST_START_TEST): Only check if the generated fingerprints are valid Base64. The fingerprints are different when running on different architectures which is a) no problem because the fingerprints are tolerant enough and b) is caused by libofa. Fixes bug #528266. --- ChangeLog | 8 ++++++++ tests/check/elements/ofa.c | 20 ++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53aad77a35..6691f92895 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-16 Sebastian Dröge + + * tests/check/elements/ofa.c: (bus_handler), (GST_START_TEST): + Only check if the generated fingerprints are valid Base64. The + fingerprints are different when running on different architectures + which is a) no problem because the fingerprints are tolerant enough + and b) is caused by libofa. Fixes bug #528266. + 2008-04-16 Sebastian Dröge * ext/timidity/Makefile.am: diff --git a/tests/check/elements/ofa.c b/tests/check/elements/ofa.c index 164191e50d..d6a8ff79af 100644 --- a/tests/check/elements/ofa.c +++ b/tests/check/elements/ofa.c @@ -19,15 +19,7 @@ #include -/* FIXME: why are the fingerprints different depending on endianness? */ -static const gchar *fingerprint_le = - "AQATABQAFwAbACIALQBHAI1//QDQAGYAOAAoAB8AGAAVABIAEAAOAA0ADAAHAAUABAADAAMAAgACAAIAAgABAAEAAQABAAEAAQABAAEAAQAB03vWCti124bd2N/y4grjsQBN5VUZAxeoFocVfhRwE5ISxBIGEUIQnxAHDLYKggjyB8kG5AYsBZQFGAS3BF8EEwPPA5EDZQM7Aw4C7QLOAq9BVS7bHvkRDwdwAAD5uvWT/8j0zREWExcUehWIFmIW6xdFF4QXpBeyF5wWLRQjEjAQfw8IDcUMpguyCvgKPwmcCQkIWwgjB8kHUQcKBswGhMA/7l0J1RkNHjEe1RyOGUv/qRcH7/X0f/h6++r/iQJ4BSUHggneC00NYBTNF30YBRerFtcVyxTEE68S2BHmEQYQRw7IDtYOWw18DRQMtgxJN13vJdld2vLlgvDf/FQENgA0Bj7vle1865rry+wf7O3sLe998TvyUvR1AEkInw3iESUS/BQ6FJsUlBRPE+4TiBOIEKMSGxHLETgQhRBXD/bU2zFHJ30MJPYi6PnmCucvAD/pMiATBx0KR/vg9ovyVe7Q7Hzp4uk05AHoSe9t9z39qAK5B2oJjwuGDYwPHA+jEgoKFhFbEUAQUBD/EJ8QuAwz7AH1zQK7ChEQ2hCgEVz/dRBAdaH0Te5395P5YfrN/HD9J/4d/qX/SwHsAkMByQE0AKP//ACMAAn/ZP8w/yn+Mv+jAEf+3QEb/rj7x/4ZMAAAAA=="; - -static const gchar *fingerprint_be = - "AQhyFyId/RqhCbIHoQmfBzEXWwlBEYIKbQ3ZDaQfQwg5FuEG5xFACroabgmSGd8RkBC6GiocphhtFJQgFRLsFuQUBBJMFkYYEQy5HvkOAxxX8X4LNO0B9/3tae7SByT4HPH789cMMQEg7QTGZxdv90HuXRcvIi02Yvy3AZoeGt+x84EjSfJ0/ZsKq/e7+BMIvQ0P6s/7PwjT8p4RR/zS/L4TLAps8YMjORL29kEKpR2/DxoSXOwQAMsFniqhC/DvMMPz9ejyFAx/6J0AsQhe65oPnwfi/3T2PSyx9ckL3Acd6mPo/fnu/xTohQSN7U8ErNvB63kIVA7o1HHqC+FAIt7/VRGS7En6PtSdEawbXA5d/kz1XgCBBOf1iwmL/qf2U+7WAJUUCBpmEQYZtgGx7SwHVwo7AnwCDhHT6hgRsdkRAc3bPQydCp3/pex7EMUJf/jg19oqthu677UM/+qZ5AwAHvdc6PkQKAQSDwcRtwZLB0Hv4wVJ9+UBh+/zDU77JPLM66YLP/vA/WAVvkH48pn8Th7mBhIadervG074ye5P/q8B9/rLDLkJqAlXB37oYtnM0YE6NfyWF7Lm1OvnCsP/bwXh7mkIkOzd7un5FPdbBFb8IgSf6dgILPt1JuD4tCUXAD/3lge/BOj95SJL740G5gwu81caze6l4TH7Oez57jEqRQdC9RLyuee4+an94hGg3I4EXwJrITcMbPGj/foRmxjcHLIKRBt/3RQS8u0/PjlFOw=="; - static gboolean found_fingerprint = FALSE; -static gboolean big_endian = FALSE; static gboolean bus_handler (GstBus * bus, GstMessage * message, gpointer data) @@ -60,10 +52,10 @@ bus_handler (GstBus * bus, GstMessage * message, gpointer data) fail_unless (gst_tag_list_get_string (tag_list, "ofa-fingerprint", &fpr)); - if (big_endian) { - fail_unless_equals_string (fpr, fingerprint_be); - } else { - fail_unless_equals_string (fpr, fingerprint_le); + while (*fpr) { + fail_unless (g_ascii_isalnum (*fpr) || *fpr == '=' || *fpr == '+' + || *fpr == '/'); + fpr++; } found_fingerprint = TRUE; @@ -134,7 +126,6 @@ GST_START_TEST (test_ofa_le_1ch) gst_object_unref (bus); found_fingerprint = FALSE; - big_endian = FALSE; gst_element_set_state (pipeline, GST_STATE_PLAYING); g_main_loop_run (loop); @@ -207,7 +198,6 @@ GST_START_TEST (test_ofa_be_1ch) gst_object_unref (bus); found_fingerprint = FALSE; - big_endian = TRUE; gst_element_set_state (pipeline, GST_STATE_PLAYING); g_main_loop_run (loop); @@ -279,7 +269,6 @@ GST_START_TEST (test_ofa_le_2ch) gst_object_unref (bus); found_fingerprint = FALSE; - big_endian = FALSE; gst_element_set_state (pipeline, GST_STATE_PLAYING); g_main_loop_run (loop); @@ -352,7 +341,6 @@ GST_START_TEST (test_ofa_be_2ch) gst_object_unref (bus); found_fingerprint = FALSE; - big_endian = TRUE; gst_element_set_state (pipeline, GST_STATE_PLAYING); g_main_loop_run (loop);