commit 13a1ef86000e235e7d5549c49ff32052cdf6a782
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Mar 27 20:12:44 2014 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Apr 04 16:33:01 2014 +0200
tree 2d3e021cf2fda1869574a171b979ba7613b67cd9
parent 470fc935b5f4778529f7f048c5f6812af97acabf

Misc selftest adjustements

programs/test/selftest.c

diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 6f73608..82477e5 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -173,16 +173,6 @@
         return( ret );
 #endif
 
-#if defined(POLARSSL_PBKDF2_C)
-    if( ( ret = pbkdf2_self_test( v ) ) != 0 )
-        return( ret );
-#else
-#if defined(POLARSSL_PKCS5_C)
-    if( ( ret = pkcs5_self_test( v ) ) != 0 )
-        return( ret );
-#endif
-#endif
-
 #if defined(POLARSSL_ECP_C)
     if( ( ret = ecp_self_test( v ) ) != 0 )
         return( ret );
@@ -193,6 +183,18 @@
         return( ret );
 #endif
 
+/* Slow tests last */
+
+#if defined(POLARSSL_PBKDF2_C)
+    if( ( ret = pbkdf2_self_test( v ) ) != 0 )
+        return( ret );
+#else
+#if defined(POLARSSL_PKCS5_C)
+    if( ( ret = pkcs5_self_test( v ) ) != 0 )
+        return( ret );
+#endif
+#endif
+
 #if defined(POLARSSL_TIMING_C)
     if( ( ret = timing_self_test( v ) ) != 0 )
         return( ret );