tests_passed is added to report in all contest types

Author: blackav

lib/run_common.c

@@ -261,30 +261,25 @@ generate_xml_report(
   if (srgp->scoring_system_val == SCORE_OLYMPIAD) {
     tr->accepting_mode = (srgp->accepting_mode > 0);
   }
+  tr->tests_passed = reply_pkt->tests_passed;
 
   if (srgp->scoring_system_val == SCORE_OLYMPIAD && srgp->accepting_mode > 0 && reply_pkt->status != RUN_ACCEPTED) {
-    tr->tests_passed = reply_pkt->tests_passed;
     tr->failed_test = total_tests - 1;
   } else if (srgp->scoring_system_val == SCORE_ACM && reply_pkt->status != RUN_OK) {
-    tr->tests_passed = reply_pkt->tests_passed;
     tr->failed_test = total_tests - 1;
   } else if (srgp->scoring_system_val == SCORE_OLYMPIAD && srgp->accepting_mode <= 0) {
-    tr->tests_passed = reply_pkt->tests_passed;
     tr->score = reply_pkt->score;
     tr->max_score = max_score;
   } else if (srgp->scoring_system_val == SCORE_KIROV) {
-    tr->tests_passed = reply_pkt->tests_passed;
     tr->score = reply_pkt->score;
     tr->max_score = max_score;
   } else if (srgp->scoring_system_val == SCORE_MOSCOW) {
     if (reply_pkt->status != RUN_OK) {
       tr->failed_test = total_tests - 1;
     }
-    tr->tests_passed = reply_pkt->tests_passed;
     tr->score = reply_pkt->score;
     tr->max_score = max_score;
   } else {
-    tr->tests_passed = reply_pkt->tests_passed;
   }
   if (report_time_limit_ms > 0) {
     tr->time_limit_ms = report_time_limit_ms;

lib/testing_report_bson.c

@@ -888,6 +888,9 @@ do_unparse(
     if (r->accepting_mode > 0) {
         bson_append_bool(b, tag_table[Tag_accepting_mode], -1, 1);
     }
+    if (r->tests_passed >= 0) {
+        bson_append_int32(b, tag_table[Tag_tests_passed], -1, r->tests_passed);
+    }
     if (r->scoring_system == SCORE_OLYMPIAD && r->accepting_mode > 0 && r->status != RUN_ACCEPTED) {
         if (r->failed_test > 0) {
             bson_append_int32(b, tag_table[Tag_failed_test], -1, r->failed_test);
@@ -897,11 +900,9 @@ do_unparse(
             bson_append_int32(b, tag_table[Tag_failed_test], -1, r->failed_test);
         }
     } else if (r->scoring_system == SCORE_OLYMPIAD && r->accepting_mode <= 0) {
-        bson_append_int32(b, tag_table[Tag_tests_passed], -1, r->tests_passed);
         bson_append_int32(b, tag_table[Tag_score], -1, r->score);
         bson_append_int32(b, tag_table[Tag_max_score], -1, r->max_score);
     } else if (r->scoring_system == SCORE_KIROV) {
-        bson_append_int32(b, tag_table[Tag_tests_passed], -1, r->tests_passed);
         bson_append_int32(b, tag_table[Tag_score], -1, r->score);
         bson_append_int32(b, tag_table[Tag_max_score], -1, r->max_score);
     } else if (r->scoring_system == SCORE_MOSCOW) {

lib/testing_report_xml.c

@@ -1632,13 +1632,11 @@ testing_report_unparse_xml(
       fprintf(out, " %s=\"%d\"", attr_map[TR_A_FAILED_TEST], r->failed_test);
     }
   } else if (r->scoring_system == SCORE_OLYMPIAD && r->accepting_mode <= 0) {
-    fprintf(out, " %s=\"%d\" %s=\"%d\" %s=\"%d\"",
-            attr_map[TR_A_TESTS_PASSED], r->tests_passed,
+    fprintf(out, " %s=\"%d\" %s=\"%d\"",
             attr_map[TR_A_SCORE], r->score,
             attr_map[TR_A_MAX_SCORE], r->max_score);
   } else if (r->scoring_system == SCORE_KIROV) {
-    fprintf(out, " %s=\"%d\" %s=\"%d\" %s=\"%d\"",
-            attr_map[TR_A_TESTS_PASSED], r->tests_passed,
+    fprintf(out, " %s=\"%d\" %s=\"%d\"",
             attr_map[TR_A_SCORE], r->score,
             attr_map[TR_A_MAX_SCORE], r->max_score);
   } else if (r->scoring_system == SCORE_MOSCOW) {
@@ -1651,6 +1649,9 @@ testing_report_unparse_xml(
             attr_map[TR_A_SCORE], r->score,
             attr_map[TR_A_MAX_SCORE], r->max_score);
   }
+  if (r->tests_passed >= 0) {
+    fprintf(out, " %s=\"%d\"", attr_map[TR_A_TESTS_PASSED], r->tests_passed);
+  }
 
   if (r->time_limit_ms > 0) {
     fprintf(out, " %s=\"%d\"", attr_map[TR_A_TIME_LIMIT_MS], r->time_limit_ms);