diff -r 097f7b60b97a -r 978c98ddb8aa test-driver.c --- a/test-driver.c Wed Mar 05 10:46:40 2008 -0500 +++ b/test-driver.c Tue Mar 11 16:48:20 2008 -0400 @@ -64,9 +64,9 @@ char *install_pkgs[3], *remove_pkgs[3]; int n_install_pkgs, n_remove_pkgs; - int in_result, result_errors; + int in_result; - int debug; + int debug, errors; }; static void @@ -214,7 +214,7 @@ fprintf(stderr, " didn't get unsatisfiable '%s %s %s'\n", name, razor_version_relations[rel], version); - exit(1); + ctx->errors++; } static void @@ -317,7 +317,7 @@ { struct test_context *ctx = data; - ctx->result_errors++; + ctx->errors++; if (old_version) { fprintf(stderr, " result set should not contain %s %s\n", name, old_version); @@ -335,11 +335,8 @@ if (ctx->result_set) { if (!ctx->system_set) ctx->system_set = razor_set_create(); - ctx->result_errors = 0; razor_set_diff(ctx->system_set, ctx->result_set, diff_callback, ctx); - if (ctx->result_errors) - exit(1); } } @@ -443,5 +440,9 @@ parse_xml_file(test_file, start_test_element, end_test_element, &ctx); - return 0; + if (ctx.errors) { + fprintf(stderr, "\n%d errors\n", ctx.errors); + return 1; + } else + return 0; }