Merge branch 'fix-fileioc' of https://github.com/CE-Programming/toolchain into fix-fileioc

Conflicts:
* test/fileioc/resize/src/main.c

Author: runer112

test/fileioc/resize/src/main.c

@@ -1,8 +1,6 @@
 #include <tice.h>
 #include <fileioc.h>
 
-void PrintText(int8_t xpos, int8_t ypos, const char *text);
-
 int main(void)
 {
     static const char *name0 = "file0";
@@ -12,56 +10,58 @@ int main(void)
     ti_var_t file1;
     ti_var_t file2;
     bool error;
+    int test;
 
     os_ClrHome();
 
     error = true;
+    test = 0;
     do
     {
         file0 = ti_Open(name0, "w");
-        if (!file0) break;
+        if (++test, !file0) break;
 
         file1 = ti_Open(name1, "w");
-        if (!file1) break;
+        if (++test, !file1) break;
 
         file2 = ti_Open(name2, "w");
-        if (!file2) break;
-
-        if (ti_Resize(1, file0) < 0) break;
-        if (ti_GetSize(file0) != 1) break;
-        if (ti_Resize(512, file0) < 0) break;
-        if (ti_GetSize(file0) != 512) break;
-        if (ti_Resize(1024, file0) < 0) break;
-        if (ti_GetSize(file0) != 1024) break;
-        if (ti_Resize(32768, file0) < 0) break;
-        if (ti_GetSize(file0) != 32768) break;
-        if (ti_Resize(1024, file0) < 0) break;
-        if (ti_GetSize(file0) != 1024) break;
-        if (ti_Resize(512, file0) < 0) break;
-        if (ti_GetSize(file0) != 512) break;
-        if (ti_Resize(1, file0) < 0) break;
-        if (ti_GetSize(file0) != 1) break;
+        if (++test, !file2) break;
+
+        if (++test, ti_Resize(1, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 1) break;
+        if (++test, ti_Resize(512, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 512) break;
+        if (++test, ti_Resize(1024, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 1024) break;
+        if (++test, ti_Resize(32768, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 32768) break;
+        if (++test, ti_Resize(1024, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 1024) break;
+        if (++test, ti_Resize(512, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 512) break;
+        if (++test, ti_Resize(1, file0) < 0) break;
+        if (++test, ti_GetSize(file0) != 1) break;
 
         if (!ti_Close(file0)) break;
 
-        if (ti_Resize(1, file1) < 0) break;
-        if (ti_GetSize(file1) != 1) break;
-        if (ti_Resize(0, file1) < 0) break;
-        if (ti_GetSize(file1) != 0) break;
-        if (ti_Resize(1, file1) < 0) break;
-        if (ti_GetSize(file1) != 1) break;
+        if (++test, ti_Resize(1, file1) < 0) break;
+        if (++test, ti_GetSize(file1) != 1) break;
+        if (++test, ti_Resize(0, file1) < 0) break;
+        if (++test, ti_GetSize(file1) != 0) break;
+        if (++test, ti_Resize(1, file1) < 0) break;
+        if (++test, ti_GetSize(file1) != 1) break;
 
         if (!ti_Close(file1)) break;
 
         file1 = ti_Open(name1, "r");
-        if (!file1) break;
+        if (++test, !file1) break;
 
-        if (ti_Resize(32768, file2) < 0) break;
-        if (ti_GetSize(file2) != 32768) break;
+        if (++test, ti_Resize(32768, file2) < 0) break;
+        if (++test, ti_GetSize(file2) != 32768) break;
 
         if (!ti_Close(file2)) break;
 
-        if (ti_GetSize(file1) != 1) break;
+        if (++test, ti_GetSize(file1) != 1) break;
 
         if (!ti_Close(file1)) break;
 
@@ -78,16 +78,10 @@ int main(void)
     }
     else
     {
-        os_PutStrFull("Fail");
+        printf("Failed at test %d", test);
     }
 
     while (!os_GetCSC());
 
     return 0;
 }
-
-void PrintText(int8_t xpos, int8_t ypos, const char *text)
-{
-    os_SetCursorPos(ypos, xpos);
-    os_PutStrFull(text);
-}