[vlc-commits] Move MD5 test to src/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 27 13:55:34 2011 +0200| [98aa3f7066d2b40d087414dd25c1a249c79a8e58] | committer: Rémi Denis-Courmont

Move MD5 test to src/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=98aa3f7066d2b40d087414dd25c1a249c79a8e58
---

 src/test/Makefile.am              |    2 ++
 {test/src/misc => src/test}/md5.c |   15 ++++++++++-----
 test/Makefile.am                  |    3 ---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 215029b..71f6768 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -4,6 +4,7 @@ check_PROGRAMS = \
 	test_block \
 	test_dictionary \
 	test_i18n_atof \
+	test_md5 \
 	test_timer \
 	test_url \
 	test_utf8 \
@@ -22,6 +23,7 @@ test_block_DEPENDENCIES =
 
 test_dictionary_SOURCES = dictionary.c
 test_i18n_atof_SOURCES = i18n_atof.c
+test_md5_SOURCES = md5.c
 test_timer_SOURCES = timer.c
 test_url_SOURCES = url.c
 test_utf8_SOURCES = utf8.c
diff --git a/test/src/misc/md5.c b/src/test/md5.c
similarity index 90%
rename from test/src/misc/md5.c
rename to src/test/md5.c
index 2014164..2f82906 100644
--- a/test/src/misc/md5.c
+++ b/src/test/md5.c
@@ -21,11 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../libvlc/test.h"
-
 #include <vlc_common.h>
 #include <vlc_md5.h>
 
@@ -60,15 +62,18 @@ static void test_config_StringEscape()
         EndMD5( &md5 );
         char * psz_hash = psz_md5_hash( &md5 );
 
-        printf( "Output: %s, Expected: %s\n", psz_hash, md5_samples[i].psz_md5 );
-        assert( !strcmp( psz_hash, md5_samples[i].psz_md5 ) );
+        if( strcmp( psz_hash, md5_samples[i].psz_md5 ) )
+        {
+            printf( "Output: %s\nExpected: %s\n", psz_hash,
+                    md5_samples[i].psz_md5 );
+            abort();
+        }
         free( psz_hash );
     }
 }
 
 int main( void )
 {
-    log( "Testing md5 calculation\n" );
     test_config_StringEscape();
 
     return 0;
diff --git a/test/Makefile.am b/test/Makefile.am
index 86e2b61..338c074 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -18,7 +18,6 @@ check_PROGRAMS = \
 	test_libvlc_media_list \
 	test_libvlc_media_player \
 	test_src_config_chain \
-	test_src_misc_md5 \
 	test_src_misc_variables \
         $(NULL)
 
@@ -73,8 +72,6 @@ test_src_misc_variables_SOURCES = src/misc/variables.c
 test_src_misc_variables_LDADD = $(LIBVLCCORE) $(LIBVLC)
 test_src_config_chain_SOURCES = src/config/chain.c
 test_src_config_chain_LDADD = $(LIBVLCCORE)
-test_src_misc_md5_SOURCES = src/misc/md5.c
-test_src_misc_md5_LDADD = $(LIBVLCCORE)
 
 checkall:
 	$(MAKE) check_PROGRAMS="$(check_PROGRAMS) $(EXTRA_PROGRAMS)" check