test/testautomation_rwops.c
changeset 9260 039714172dc3
parent 9254 6c469ea796e4
child 10782 1de6d4633ee6
     1.1 --- a/test/testautomation_rwops.c	Wed Dec 03 11:04:07 2014 -0500
     1.2 +++ b/test/testautomation_rwops.c	Wed Dec 03 12:23:17 2014 -0500
     1.3 @@ -105,7 +105,7 @@
     1.4     /* Set to start. */
     1.5     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
     1.6     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
     1.7 -   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %lli", i);
     1.8 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %"SDL_PRIs64, i);
     1.9  
    1.10     /* Test write. */
    1.11     s = SDL_RWwrite(rw, RWopsHelloWorldTestString, sizeof(RWopsHelloWorldTestString)-1, 1);
    1.12 @@ -120,12 +120,12 @@
    1.13     /* Test seek to random position */
    1.14     i = SDL_RWseek( rw, seekPos, RW_SEEK_SET );
    1.15     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    1.16 -   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %lli", seekPos, seekPos, i);
    1.17 +   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %"SDL_PRIs64, seekPos, seekPos, i);
    1.18  
    1.19     /* Test seek back to start */
    1.20     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
    1.21     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    1.22 -   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %lli", i);
    1.23 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %"SDL_PRIs64, i);
    1.24  
    1.25     /* Test read */
    1.26     s = SDL_RWread( rw, buf, 1, sizeof(RWopsHelloWorldTestString)-1 );
    1.27 @@ -144,7 +144,7 @@
    1.28     SDLTest_AssertPass("Call to SDL_RWseek(...,-4,RW_SEEK_CUR) succeeded");
    1.29     SDLTest_AssertCheck(
    1.30         i == (Sint64)(sizeof(RWopsHelloWorldTestString)-5),
    1.31 -       "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %lli",
    1.32 +       "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %"SDL_PRIs64,
    1.33         sizeof(RWopsHelloWorldTestString)-5,
    1.34         i);
    1.35  
    1.36 @@ -152,7 +152,7 @@
    1.37     SDLTest_AssertPass("Call to SDL_RWseek(...,-1,RW_SEEK_END) succeeded");
    1.38     SDLTest_AssertCheck(
    1.39         i == (Sint64)(sizeof(RWopsHelloWorldTestString)-2),
    1.40 -       "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %lli",
    1.41 +       "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %"SDL_PRIs64,
    1.42         sizeof(RWopsHelloWorldTestString)-2,
    1.43         i);
    1.44  
    1.45 @@ -161,7 +161,7 @@
    1.46     SDLTest_AssertPass("Call to SDL_RWseek(...,0,invalid_whence) succeeded");
    1.47     SDLTest_AssertCheck(
    1.48         i == (Sint64)(-1),
    1.49 -       "Verify seek with SDL_RWseek (invalid_whence); expected: -1, got %lli",
    1.50 +       "Verify seek with SDL_RWseek (invalid_whence); expected: -1, got %"SDL_PRIs64,
    1.51         i);
    1.52  }
    1.53  
    1.54 @@ -560,7 +560,7 @@
    1.55  
    1.56       /* Compare */
    1.57       SDLTest_AssertCheck(rv_mem == rv_file, "Verify returned read blocks matches for mem and file reads; got: rv_mem=%d rv_file=%d", rv_mem, rv_file);
    1.58 -     SDLTest_AssertCheck(sv_mem == sv_file, "Verify SEEK_END position matches for mem and file seeks; got: sv_mem=%llu sv_file=%llu", sv_mem, sv_file);
    1.59 +     SDLTest_AssertCheck(sv_mem == sv_file, "Verify SEEK_END position matches for mem and file seeks; got: sv_mem=%"SDL_PRIu64" sv_file=%"SDL_PRIu64, sv_mem, sv_file);
    1.60       SDLTest_AssertCheck(buffer_mem[slen] == 0, "Verify mem buffer termination; expected: 0, got: %d", buffer_mem[slen]);
    1.61       SDLTest_AssertCheck(buffer_file[slen] == 0, "Verify file buffer termination; expected: 0, got: %d", buffer_file[slen]);
    1.62       SDLTest_AssertCheck(
    1.63 @@ -668,7 +668,7 @@
    1.64       /* Test seek to start */
    1.65       result = SDL_RWseek( rw, 0, RW_SEEK_SET );
    1.66       SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    1.67 -     SDLTest_AssertCheck(result == 0, "Verify result from position 0 with SDL_RWseek, expected 0, got %lli", result);
    1.68 +     SDLTest_AssertCheck(result == 0, "Verify result from position 0 with SDL_RWseek, expected 0, got %"SDL_PRIs64, result);
    1.69  
    1.70       /* Read test data */
    1.71       BE16test = SDL_ReadBE16(rw);
    1.72 @@ -679,7 +679,7 @@
    1.73       SDLTest_AssertCheck(BE32test == BE32value, "Validate return value from SDL_ReadBE32, expected: %u, got: %u", BE32value, BE32test);
    1.74       BE64test = SDL_ReadBE64(rw);
    1.75       SDLTest_AssertPass("Call to SDL_ReadBE64()");
    1.76 -     SDLTest_AssertCheck(BE64test == BE64value, "Validate return value from SDL_ReadBE64, expected: %llu, got: %llu", BE64value, BE64test);
    1.77 +     SDLTest_AssertCheck(BE64test == BE64value, "Validate return value from SDL_ReadBE64, expected: %"SDL_PRIu64", got: %"SDL_PRIu64, BE64value, BE64test);
    1.78       LE16test = SDL_ReadLE16(rw);
    1.79       SDLTest_AssertPass("Call to SDL_ReadLE16()");
    1.80       SDLTest_AssertCheck(LE16test == LE16value, "Validate return value from SDL_ReadLE16, expected: %hu, got: %hu", LE16value, LE16test);
    1.81 @@ -688,7 +688,7 @@
    1.82       SDLTest_AssertCheck(LE32test == LE32value, "Validate return value from SDL_ReadLE32, expected: %u, got: %u", LE32value, LE32test);
    1.83       LE64test = SDL_ReadLE64(rw);
    1.84       SDLTest_AssertPass("Call to SDL_ReadLE64()");
    1.85 -     SDLTest_AssertCheck(LE64test == LE64value, "Validate return value from SDL_ReadLE64, expected: %llu, got: %llu", LE64value, LE64test);
    1.86 +     SDLTest_AssertCheck(LE64test == LE64value, "Validate return value from SDL_ReadLE64, expected: %"SDL_PRIu64", got: %"SDL_PRIu64, LE64value, LE64test);
    1.87  
    1.88       /* Close handle */
    1.89       cresult = SDL_RWclose(rw);