Fix tests to work with DEPRECATED_REMOVED
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 280e3b7..a9aef59 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -203,17 +203,16 @@
return( ret );
#endif
-/* Slow tests last */
-
-#if defined(POLARSSL_PBKDF2_C)
+#if defined(POLARSSL_PBKDF2_C) && !defined(POLARSSL_DEPRECATED_REMOVED)
if( ( ret = pbkdf2_self_test( v ) ) != 0 )
return( ret );
-#else
+#endif
#if defined(POLARSSL_PKCS5_C)
if( ( ret = pkcs5_self_test( v ) ) != 0 )
return( ret );
#endif
-#endif
+
+/* Slow tests last */
/* Not stable enough on Windows and FreeBSD yet */
#if __linux__ && defined(POLARSSL_TIMING_C)
diff --git a/tests/scripts/generate_code.pl b/tests/scripts/generate_code.pl
index ba74738..81c454c 100755
--- a/tests/scripts/generate_code.pl
+++ b/tests/scripts/generate_code.pl
@@ -50,8 +50,9 @@
while (@var_req_arr)
{
my $req = shift @var_req_arr;
+ $req =~ s/(!?)(.*)/$1defined($2)/;
- $suite_pre_code .= "#ifdef $req\n";
+ $suite_pre_code .= "#if $req\n";
$suite_post_code .= "#endif /* $req */\n";
}
diff --git a/tests/suites/test_suite_pbkdf2.function b/tests/suites/test_suite_pbkdf2.function
index f99cb6d..73dbd15 100644
--- a/tests/suites/test_suite_pbkdf2.function
+++ b/tests/suites/test_suite_pbkdf2.function
@@ -3,7 +3,7 @@
/* END_HEADER */
/* BEGIN_DEPENDENCIES
- * depends_on:POLARSSL_PBKDF2_C
+ * depends_on:POLARSSL_PBKDF2_C:!POLARSSL_DEPRECATED_REMOVED
* END_DEPENDENCIES
*/