Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 609650 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/rdf_serializer.c (-9 / +14 lines)
Lines 945-951 log_handler(void *user_data, librdf_log_message *message) Link Here
945
}
945
}
946
946
947
947
948
#define EXPECTED_ERRORS 3
948
#define EXPECTED_ERRORS1 3
949
/* Extra error is another UTF-8 encoding error */
950
#define EXPECTED_ERRORS2 4
949
#define EXPECTED_WARNINGS 0
951
#define EXPECTED_WARNINGS 0
950
952
951
#define SYNTAX_TYPE "ntriples"
953
#define SYNTAX_TYPE "ntriples"
Lines 1029-1038 main(int argc, char *argv[]) Link Here
1029
  string=librdf_serializer_serialize_model_to_counted_string(serializer,
1031
  string=librdf_serializer_serialize_model_to_counted_string(serializer,
1030
                                                             base_uri, model,
1032
                                                             base_uri, model,
1031
                                                             &string_length);
1033
                                                             &string_length);
1032
#define EXPECTED_BAD_STRING_LENGTH 382
1034
#define EXPECTED_BAD_STRING_LENGTH1 382
1033
  if(string_length != EXPECTED_BAD_STRING_LENGTH) {
1035
/* Raptor 2.0.11 changed the serialization slightly */
1034
    fprintf(stderr, "%s: Serialising model to RDF/XML returned string '%s' size %d, expected %d\n", program, string,
1036
#define EXPECTED_BAD_STRING_LENGTH2 378
1035
            (int)string_length, EXPECTED_BAD_STRING_LENGTH);
1037
  if(string_length != EXPECTED_BAD_STRING_LENGTH1 && 
1038
     string_length != EXPECTED_BAD_STRING_LENGTH2) {
1039
    fprintf(stderr, "%s: Serialising model to RDF/XML returned string '%s' size %d, expected %d or %d\n", program, string,
1040
            (int)string_length,
1041
            EXPECTED_BAD_STRING_LENGTH1, EXPECTED_BAD_STRING_LENGTH2);
1036
    return 1;
1042
    return 1;
1037
  }
1043
  }
1038
1044
Lines 1043-1051 main(int argc, char *argv[]) Link Here
1043
  librdf_free_storage(storage); storage=NULL;
1049
  librdf_free_storage(storage); storage=NULL;
1044
  
1050
  
1045
1051
1046
  if(LogData.errors != EXPECTED_ERRORS) {
1052
  if(LogData.errors != EXPECTED_ERRORS1 && LogData.errors != EXPECTED_ERRORS2) {
1047
    fprintf(stderr, "%s: Serialising to RDF/XML returned %d errors, expected %d\n", program,
1053
    fprintf(stderr, "%s: Serialising to RDF/XML returned %d errors, expected %d or %d\n", program,
1048
            LogData.errors, EXPECTED_ERRORS);
1054
            LogData.errors, EXPECTED_ERRORS1, EXPECTED_ERRORS2);
1049
    return 1;
1055
    return 1;
1050
  }
1056
  }
1051
1057
1052
- 

Return to bug 609650