Commit b34fef2f authored by Paul Bakker's avatar Paul Bakker
Browse files

Suite dependencies handled correctly now

parent 33b43f1e
......@@ -65,10 +65,11 @@ $suite_header
$test_helpers
$suite_pre_code
END
$test_main =~ s/SUITE_PRE_DEP/$suite_pre_code/;
$test_main =~ s/SUITE_POST_DEP/$suite_post_code/;
while($test_cases =~ /\/\* BEGIN_CASE *([\w:]*) \*\/\n(.*?)\n\/\* END_CASE \*\//msg)
{
my $function_deps = $1;
......@@ -219,8 +220,6 @@ $test_main =~ s/DISPATCH_FUNCTION/$dispatch_code/;
$test_main =~ s/MAPPING_CODE/$mapping_code/;
print TEST_FILE << "END";
$suite_post_code
$test_main
END
......
......@@ -88,18 +88,27 @@ DEP_CHECK_CODE
return( 1 );
}
SUITE_PRE_DEP
#define TEST_SUITE_ACTIVE
FUNCTION_CODE
SUITE_POST_DEP
int dispatch_test(int cnt, char *params[50])
{
int ret;
((void) cnt);
((void) params);
#if defined(TEST_SUITE_ACTIVE)
DISPATCH_FUNCTION
{
fprintf( stdout, "FAILED\nSkipping unknown test function '%s'\n", params[0] );
fflush( stdout );
return( 1 );
}
#else
return( 3 );
#endif
return( ret );
}
......@@ -239,7 +248,7 @@ int main()
if( skip == 1 || ret == 3 )
{
total_skipped++;
fprintf( stdout, "-------\n" );
fprintf( stdout, "----\n" );
fflush( stdout );
}
else if( ret == 0 && test_errors == 0 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment