Changeset 1c507eb for tests


Ignore:
Timestamp:
Sep 4, 2020, 2:00:53 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
7a80113
Parents:
5a1c9ef (diff), 2801829 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
tests
Files:
5 added
7 edited

Legend:

Unmodified
Added
Removed

  • tests/.expect/alloc-ERROR.txt

    r5a1c9ef r1c507eb  
    1 alloc.cfa:362:1 error: No reasonable alternatives for expression Applying untyped:
     1alloc.cfa:361:1 error: No reasonable alternatives for expression Applying untyped:
    22  Name: ?=?
    33...to:
    … …  
    1616          Name: stp
    1717
    18       with resolved type:
    19         unsigned long int
    2018
    2119
    2220
    23 alloc.cfa:363:1 error: No reasonable alternatives for expression Applying untyped:
     21alloc.cfa:362:1 error: No reasonable alternatives for expression Applying untyped:
    2422  Name: ?=?
    2523...to:
    … …  
    3028    Name: stp
    3129    constant expression (10 10: signed int)
    32     with resolved type:
    33       signed int
    3430
    3531
    36 alloc.cfa:364:1 error: No reasonable alternatives for expression Applying untyped:
     32alloc.cfa:363:1 error: No reasonable alternatives for expression Applying untyped:
    3733  Name: ?=?
    3834...to:

  • tests/.expect/alloc.txt

    r5a1c9ef r1c507eb  
    14140xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede
    1515CFA array alloc, fill 0xef
    16 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef
     160xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef
    1717CFA array alloc, fill from array
    18 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef, 0xefefefef 0xefefefef,
     180xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef, 0xdeadbeef 0xdeadbeef,
    1919
    2020C realloc
    21 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef
     210xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef
    2222CFA realloc
    23 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0xefefefef 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101
     230xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101
    2424
    2525CFA realloc array alloc

  • tests/alloc2.cfa

    r5a1c9ef r1c507eb  
    1 /*
    2         some tests are commented-out because of resize/realloc bug from 0p. They should be uncommented after that bug is resolved.
    3 */
    4 
    51#include <malloc.h>                                                                             // malloc_usable_size
    62#include <stdint.h>                                                                             // uintptr_t
    … …  
    2016        if (!passed) {
    2117                printf("failed test %3d: %4lu %4lu but got %4lu ( %3lu ) %4lu\n", tests_total, size, align, malloc_size(ip), malloc_usable_size(ip), malloc_alignment(ip));
    22 //              if (last_failed != tests_total) {
    23                         tests_failed += 1;
    24 //                      last_failed = tests_total;
    25 //              }
     18                tests_failed += 1;
    2619        }
    2720}
    … …  
    3427        if (!passed) {
    3528                printf("failed test %3d: fill C\n", tests_total);
    36 //              if (last_failed != tests_total) {
    37                         tests_failed += 1;
    38 //                      last_failed = tests_total;
    39 //              }
     29                tests_failed += 1;
    4030        }
    4131}
    … …  
    4838        if (!passed) {
    4939                printf("failed test %3d: fill int\n", tests_total);
    50 //              if (last_failed != tests_total) {
    51                         tests_failed += 1;
    52 //                      last_failed = tests_total;
    53 //              }
     40                tests_failed += 1;
    5441        }
    5542}
    … …  
    6047        if (!passed) {
    6148                printf("failed test %3d: fill int A\n", tests_total);
    62 //              if (last_failed != tests_total) {
    63                         tests_failed += 1;
    64 //                      last_failed = tests_total;
    65 //              }
     49                tests_failed += 1;
    6650        }
    6751}
    … …  
    7458        if (!passed) {
    7559                printf("failed test %3d: fill T1\n", tests_total);
    76 //              if (last_failed != tests_total) {
    77                         tests_failed += 1;
    78 //                      last_failed = tests_total;
    79 //              }
     60                tests_failed += 1;
    8061        }
    8162}
    … …  
    8667        if (!passed) {
    8768                printf("failed test %3d: fill T1 A\n", tests_total);
    88 //              if (last_failed != tests_total) {
    89                         tests_failed += 1;
    90 //                      last_failed = tests_total;
    91 //              }
     69                tests_failed += 1;
    9270        }
    9371}
    … …  
    10078        if (!passed) {
    10179                printf("failed test %3d: use int\n", tests_total);
    102 //              if (last_failed != tests_total) {
    103                         tests_failed += 1;
    104 //                      last_failed = tests_total;
    105 //              }
     80                tests_failed += 1;
    10681        }
    10782}
    … …  
    11489        if (!passed) {
    11590                printf("failed test %3d: use T1\n", tests_total);
    116 //              if (last_failed != tests_total) {
    117                         tests_failed += 1;
    118 //                      last_failed = tests_total;
    119 //              }
     91                tests_failed += 1;
    12092        }
    12193}
    … …  
    331303        free(ip);
    332304
    333 //      ip = alloc( 0, ((int*)0p)`realloc, FillT`fill );
    334 //      est_base(ip, 0, libAlign);
    335 //      free(ip);
     305        ip = alloc( 0, ((int*)0p)`realloc, FillT`fill );
     306        test_base(ip, 0, libAlign);
     307        free(ip);
    336308
    337309        ip = alloc( align`align );
    … …  
    356328        free(ip);
    357329
    358 //      ip = alloc( ((int*)0p)`realloc, align`align );
    359 //      est_base(ip, elemSize, align);
    360 //      est_use(ip, elemSize / elemSize);
    361 //      free(ip);
     330        ip = alloc( ((int*)0p)`realloc, align`align );
     331        test_base(ip, elemSize, align);
     332        test_use(ip, elemSize / elemSize);
     333        free(ip);
    362334
    363335        dp = alloc( dim );
    … …  
    367339        free(ip);
    368340
    369 //      ip = alloc( ((double*)0p)`resize, align`align );
    370 //      est_base(ip, elemSize, align);
    371 //      est_use(ip, elemSize / elemSize);
    372 //      free(ip);
     341        ip = alloc( ((double*)0p)`resize, align`align );
     342        test_base(ip, elemSize, align);
     343        test_use(ip, elemSize / elemSize);
     344        free(ip);
    373345
    374346        op = alloc( dim, ((int)0xdeadbeef)`fill);
    … …  
    384356        free(ip);
    385357
    386 //      ip = alloc( dim, ((int*)0p)`realloc, align`align );
    387 //      est_base(ip, size, align);
    388 //      est_use(ip, size / elemSize);
    389 //      free(ip);
    390 
    391 //      ip = alloc( 0, ((int*)0p)`realloc, align`align );
    392 //      est_base(ip, 0, align);
    393 //      free(ip);
     358        ip = alloc( dim, ((int*)0p)`realloc, align`align );
     359        test_base(ip, size, align);
     360        test_use(ip, size / elemSize);
     361        free(ip);
     362
     363        ip = alloc( 0, ((int*)0p)`realloc, align`align );
     364        test_base(ip, 0, libAlign);
     365        free(ip);
    394366
    395367        ip = alloc( align`align, FillC`fill );
    … …  
    462434        free(ip);
    463435
    464 //      ip = alloc( dim, ((int*)0p)`realloc, align`align, FillC`fill );
    465 //      est_base(ip, size, align);
    466 //      est_fill(ip, 0, size, FillC);
    467 //      est_use(ip, size / elemSize);
    468 //      free(ip);
    469 
    470 //      ip = alloc( 0, ((int*)0p)`realloc, align`align, FillC`fill );
    471 //      est_base(ip, 0, align);
    472 //      free(ip);
     436        ip = alloc( dim, ((int*)0p)`realloc, align`align, FillC`fill );
     437        test_base(ip, size, align);
     438        test_fill(ip, 0, size, FillC);
     439        test_use(ip, size / elemSize);
     440        free(ip);
     441
     442        ip = alloc( 0, ((int*)0p)`realloc, align`align, FillC`fill );
     443        test_base(ip, 0, libAlign);
     444        free(ip);
    473445
    474446        op = alloc( dim, ((int)0xdeadbeef)`fill );
    … …  
    499471        free(ip);
    500472
    501 //      ip = alloc( dim, ((int*)0p)`realloc, align`align, FillT`fill );
    502 //      est_base(ip, size, align);
    503 //      est_fill(ip, 0, dim, FillT);
    504 //      est_use(ip, size / elemSize);
    505 //      free(ip);
    506 
    507 //      ip = alloc( 0, ((int*)0p)`realloc, align`align, FillT`fill );
    508 //      est_base(ip, 0, align);
    509 //      free(ip);
     473        ip = alloc( dim, ((int*)0p)`realloc, align`align, FillT`fill );
     474        test_base(ip, size, align);
     475        test_fill(ip, 0, dim, FillT);
     476        test_use(ip, size / elemSize);
     477        free(ip);
     478
     479        ip = alloc( 0, ((int*)0p)`realloc, align`align, FillT`fill );
     480        test_base(ip, 0, libAlign);
     481        free(ip);
    510482
    511483        if (tests_failed == 0) printf("PASSED alloc tests\n\n");
    … …  
    704676        free(t1p);
    705677
    706 //      t1p = alloc( (T1*)0p, 0, FillT1 );
    707 //      est_base(t1p, 0, tAlign);
    708 //      free(t1p);
     678        t1p = alloc( 0, ((T1*)0p)`realloc, FillT1`fill );
     679        test_base(t1p, 0, libAlign);
     680        free(t1p);
    709681
    710682        t1p = alloc( align`align );
    … …  
    729701        free(t1p);
    730702
    731 //      t1p = alloc( ((T1*)0p)`realloc, align`align );
    732 //      est_base(t1p, elemSize, align);
    733 //      est_use(t1p, elemSize / elemSize);
    734 //      free(t1p);
     703        t1p = alloc( ((T1*)0p)`realloc, align`align );
     704        test_base(t1p, elemSize, align);
     705        test_use(t1p, elemSize / elemSize);
     706        free(t1p);
    735707
    736708        dp = alloc( dim );
    … …  
    740712        free(t1p);
    741713
    742 //      t1p = alloc( ((double*)0p)`resize, align`align );
    743 //      est_base(t1p, elemSize, align);
    744 //      est_use(t1p, elemSize / elemSize);
    745 //      free(t1p);
     714        t1p = alloc( ((double*)0p)`resize, align`align );
     715        test_base(t1p, elemSize, align);
     716        test_use(t1p, elemSize / elemSize);
     717        free(t1p);
    746718
    747719        t1op = alloc( dim, ((T1){0xdeadbeef})`fill );
    … …  
    757729        free(t1p);
    758730
    759 //      t1p = alloc( dim, ((T1*)0p)`realloc, align`align );
    760 //      est_base(t1p, size, align);
    761 //      est_use(t1p, size / elemSize);
    762 //      free(t1p);
    763 
    764 //      t1p = alloc( 0, ((T1*)0p)`realloc, align`align );
    765 //      est_base(t1p, 0, align);
    766 //      free(t1p);
     731        t1p = alloc( dim, ((T1*)0p)`realloc, align`align );
     732        test_base(t1p, size, align);
     733        test_use(t1p, size / elemSize);
     734        free(t1p);
     735
     736        t1p = alloc( 0, ((T1*)0p)`realloc, align`align );
     737        test_base(t1p, 0, libAlign);
     738        free(t1p);
    767739
    768740        t1p = alloc( align`align, FillC`fill );
    … …  
    835807        free(t1p);
    836808
    837 //      t1p = alloc( dim, ((T1*)0p)`realloc, align`align, FillC`fill );
    838 //      est_base(t1p, size, align);
    839 //      est_fill(t1p, 0, size, FillC);
    840 //      est_use(t1p, size / elemSize);
    841 //      free(t1p);
    842 
    843 //      t1p = alloc( 0, ((T1*)0p)`realloc, align`align, FillC`fill );
    844 //      est_base(t1p, 0, align);
    845 //      free(t1p);
     809        t1p = alloc( dim, ((T1*)0p)`realloc, align`align, FillC`fill );
     810        test_base(t1p, size, align);
     811        test_fill(t1p, 0, size, FillC);
     812        test_use(t1p, size / elemSize);
     813        free(t1p);
     814
     815        t1p = alloc( 0, ((T1*)0p)`realloc, align`align, FillC`fill );
     816        test_base(t1p, 0, libAlign);
     817        free(t1p);
    846818
    847819        t1op = alloc( dim, ((T1){0xdeadbeef})`fill);
    … …  
    872844        free(t1p);
    873845
    874 //      t1p = alloc( dim, ((T1*)0p)`realloc, align`aling, FillT1`fill );
    875 //      est_base(t1p, size, align);
    876 //      est_fill(t1p, 0, dim, FillT1);
    877 //      est_use(t1p, size / elemSize);
    878 //      free(t1p);
    879 
    880 //      t1p = alloc( 0, ((T1*)0p)`realloc, align`align, FillT1`fill );
    881 //      est_base(t1p, 0, align);
    882 //      free(t1p);
     846        t1p = alloc( dim, ((T1*)0p)`realloc, align`align, FillT1`fill );
     847        test_base(t1p, size, align);
     848        test_fill(t1p, 0, dim, FillT1);
     849        test_use(t1p, size / elemSize);
     850        free(t1p);
     851
     852        t1p = alloc( 0, ((T1*)0p)`realloc, align`align, FillT1`fill );
     853        test_base(t1p, 0, libAlign);
     854        free(t1p);
    883855
    884856        if (tests_failed == 0) printf("PASSED alloc tests (aligned struct)\n\n");

  • tests/concurrent/examples/boundedBufferEXT.cfa

    r5a1c9ef r1c507eb  
    11//
    22// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
    3 // 
     3//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    … …  
    8787}
    8888
     89enum { Prods = 4, Cons = 5 };
     90Producer * prods[Prods];
     91Consumer * cons[Cons];
     92
    8993int main() {
    9094        Buffer(int) buffer;
    91         enum { Prods = 4, Cons = 5 };
    92         Producer * prods[Prods];
    93         Consumer * cons[Cons];
    9495        int sums[Cons];
    9596        int i;

  • tests/errors/.expect/completeType.x86.txt

    r5a1c9ef r1c507eb  
    66    Name: x
    77
    8 ... to: nothing
    9 with resolved type:
    10   void  Alternatives are:
     8... to: nothing Alternatives are:
    119Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
    1210      Application of
    … …  
    2220
    2321
    24         with resolved type:
    25           pointer to forall
    26             _89_4_DT: data type
    27             function
    28           ... with parameters
    29             intrinsic pointer to instance of type _89_4_DT (not function type)
    30           ... returning
    31             _retval__operator_deref: reference to instance of type _89_4_DT (not function type)
    32             ... with attributes:
    33               Attribute with name: unused
    34 
    35 
    3622      ... to arguments
    3723        Variable Expression: x: pointer to instance of struct A with body 0
    38         with resolved type:
    39           pointer to instance of struct A with body 0
    4024
    41       with resolved type:
    42         reference to instance of struct A with body 0
    4325    ... to: nothing
    44     with resolved type:
    45       void
    4626  (types:
    4727    void
    … …  
    6343
    6444
    65         with resolved type:
    66           pointer to forall
    67             _89_4_DT: data type
    68             function
    69           ... with parameters
    70             intrinsic pointer to instance of type _89_4_DT (not function type)
    71           ... returning
    72             _retval__operator_deref: reference to instance of type _89_4_DT (not function type)
    73             ... with attributes:
    74               Attribute with name: unused
    75 
    76 
    7745      ... to arguments
    7846        Variable Expression: x: pointer to instance of struct B with body 1
    79         with resolved type:
    80           pointer to instance of struct B with body 1
    8147
    82       with resolved type:
    83         reference to instance of struct B with body 1
    8448    ... to: nothing
    85     with resolved type:
    86       void
    8749  (types:
    8850    void
    … …  
    159121            ... returning nothing
    160122
    161             with resolved type:
    162               pointer to forall
    163                 _108_0_T: sized data type
    164                 ... with assertions
    165                   ?=?: pointer to function
    166                   ... with parameters
    167                     reference to instance of type _108_0_T (not function type)
    168                     instance of type _108_0_T (not function type)
    169                   ... returning
    170                     _retval__operator_assign: instance of type _108_0_T (not function type)
    171                     ... with attributes:
    172                       Attribute with name: unused
    173 
    174 
    175                   ?{}: pointer to function
    176                   ... with parameters
    177                     reference to instance of type _108_0_T (not function type)
    178                   ... returning nothing
    179 
    180                   ?{}: pointer to function
    181                   ... with parameters
    182                     reference to instance of type _108_0_T (not function type)
    183                     instance of type _108_0_T (not function type)
    184                   ... returning nothing
    185 
    186                   ^?{}: pointer to function
    187                   ... with parameters
    188                     reference to instance of type _108_0_T (not function type)
    189                   ... returning nothing
    190 
    191 
    192                 function
    193               ... with parameters
    194                 pointer to instance of type _108_0_T (not function type)
    195               ... returning nothing
    196 
    197123          ... to arguments
    198124            Variable Expression: z: pointer to instance of type T (not function type)
    199             with resolved type:
    200               pointer to instance of type T (not function type)
    201125
    202           with resolved type:
    203             void
    204126        (types:
    205127          void

  • tests/malloc.cfa

    r5a1c9ef r1c507eb  
    252252
    253253        ip = (int *) (void *) malloc( size );
     254        ip = (int *) (void *) resize( (void *) ip, libAlign, size / 2 );
     255        test_base(ip, size / 2, libAlign);
     256        test_use(ip);
     257        free(ip);
     258
     259        ip = (int *) (void *) aligned_alloc( align, size );
     260        ip = (int *) (void *) resize( (void *) ip, align, size / 2 );
     261        test_base(ip, size / 2, align);
     262        test_use(ip);
     263        free(ip);
     264
     265        ip = (int *) (void *) malloc( size );
    254266        ip = (int *) (void *) resize( (void *) ip, align, size / 4 );
    255267        test_base(ip, size / 4, align);
    … …  
    270282        ip = (int *) (void *) resize( 0p, align, size );
    271283        test_base(ip, size, align);
     284        test_use(ip);
     285        free(ip);
     286
     287        ip = (int *) (void *) calloc( dim, elemSize );
     288        ip = (int *) (void *) realloc( (void *) ip, libAlign, size / 2 );
     289        test_base(ip, size / 2, libAlign);
     290        test_fill(ip, 0, size / 2, '\0');
     291        test_use(ip);
     292        free(ip);
     293
     294        ip = (int *) (void *) cmemalign( align, dim, elemSize );
     295        ip = (int *) (void *) realloc( (void *) ip, align, size / 2 );
     296        test_base(ip, size / 2, align);
     297        test_fill(ip, 0, size / 2, '\0');
    272298        test_use(ip);
    273299        free(ip);
    … …  
    348374        free(ip);
    349375
    350         ip = resize( NULL, size );
    351         test_base(ip, size, libAlign);
    352         test_use(ip);
    353         free(ip);
    354 
    355         ip = resize( 0p, size );
     376        ip = resize( (int*)0p, size );
     377        test_base(ip, size, libAlign);
     378        test_use(ip);
     379        free(ip);
     380
     381        ip = resize( (int*)0p, size );
    356382        test_base(ip, size, libAlign);
    357383        test_use(ip);
    … …  
    378404        free(ip);
    379405
    380         ip = realloc( NULL, size );
     406        ip = realloc( (int*)0p, size );
    381407        test_base(ip, size , libAlign);
    382408        test_use(ip);
    383409        free(ip);
    384410
    385         ip = realloc( 0p, size );
     411        ip = realloc( (int*)0p, size );
    386412        test_base(ip, size, libAlign);
    387413        test_use(ip);
    … …  
    437463        else printf("failed CFA malloc tests : %d/%d\n\n", tests_failed, tests_total);
    438464
    439         // testing CFA malloc
     465        // testing CFA malloc with aligned struct
    440466
    441467        elemSize = sizeof(T1);
    … …  
    488514        free(tp);
    489515
    490         tp = resize( NULL, size );
     516        tp = resize( (T1*)0p, size );
    491517        test_base(tp, size, tAlign );
    492518        test_use(tp);
    493519        free(tp);
    494520
    495         tp = resize( 0p, size );
     521        tp = resize( (T1*)0p, size );
    496522        test_base(tp, size, tAlign );
    497523        test_use(tp);
    … …  
    518544        free(tp);
    519545
    520         tp = realloc( NULL, size  );
     546        tp = realloc( (T1*)0p, size  );
    521547        test_base(tp, size , tAlign );
    522548        test_use(tp);
    523549        free(tp);
    524550
    525         tp = realloc( 0p, size );
     551        tp = realloc( (T1*)0p, size );
    526552        test_base(tp, size, tAlign );
    527553        test_use(tp);
    … …  
    559585        free(tp);
    560586
    561         (int) posix_memalign( (int **) &tp, align );
     587        (int) posix_memalign( (T1 **) &tp, align );
    562588        test_base(tp, elemSize, align);
    563589        test_use(tp);

  • tests/test.py

    r5a1c9ef r1c507eb  
    116116        parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default=None)
    117117        parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
    118         parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
     118        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=120)
    119119        parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
    120120        parser.add_argument('--timeout-with-gdb', help='Instead of killing the command when it times out, orphan it and print process id to allow gdb to attach', type=yes_no, default="no")
Note: See TracChangeset for help on using the changeset viewer.