diff -r f600b0d1fc5d -r faab25d520dd test/harness/testcaseio.c --- a/test/harness/testcaseio.c Fri Jan 27 10:30:16 2012 +0000 +++ b/test/harness/testcaseio.c Fri Jan 27 16:18:02 2012 +0000 @@ -1,6 +1,7 @@ #include #include #include +#include #include #include "testcaseparser.h" #include "testcaseio.h" @@ -16,7 +17,7 @@ TestcaseParser *parser; char *s; const char *tag,*text; - boolean found_tag=FALSE; + gboolean found_tag=FALSE; parser=testcase_parser_new_from_file(filename); if (!parser) return NULL; @@ -26,17 +27,17 @@ testcase_parser_free(parser); return NULL; } - testcase=mem_new0(Testcase,1); - testcase->basename=path_get_basename(filename); + testcase=g_new0(Testcase,1); + testcase->basename=g_path_get_basename(filename); s=strrchr(testcase->basename,'.'); if (s) *s='\0'; while(testcase_parser_get_next_tag(parser,&tag,&text)) { if (!testcase->input && !strcmp(tag,"INPUT")) - testcase->input=str_dup(text); + testcase->input=g_strdup(text); else if (!testcase->expected && !strcmp(tag,"EXPECTED")) - testcase->expected=str_dup(text); + testcase->expected=g_strdup(text); else { fprintf(stderr,"%s: Not a valid testcase (%s)\n",filename,tag);