Changeset bae0d35 for tests


Ignore:
Timestamp:
Jun 7, 2021, 2:09:12 PM (4 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
5a46e09
Parents:
82f4063 (diff), 53692b3 (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:
1 added
1 deleted
44 edited
1 moved

Legend:

Unmodified
Added
Removed

  • tests/.expect/array.txt

    r82f4063 rbae0d35  
    1 array.cfa: In function '_X4mainFi___1':
    2 array.cfa:55:9: note: #pragma message: Compiled
     1array.cfa:52:25: warning: Compiled

  • tests/.expect/cast.txt

    r82f4063 rbae0d35  
    1 cast.cfa: In function '_X4mainFi_iPPKc__1':
    2 cast.cfa:18:9: note: #pragma message: Compiled
     1cast.cfa:16:25: warning: Compiled

  • tests/.expect/expression.txt

    r82f4063 rbae0d35  
    1 expression.cfa: In function '_X4mainFi___1':
    2 expression.cfa:89:9: note: #pragma message: Compiled
     1expression.cfa:86:25: warning: Compiled

  • tests/.expect/forall.txt

    r82f4063 rbae0d35  
    1 forall.cfa: In function '_X4mainFi___1':
    2 forall.cfa:218:9: note: #pragma message: Compiled
     1forall.cfa:216:25: warning: Compiled

  • tests/.expect/identFuncDeclarator.txt

    r82f4063 rbae0d35  
    1 identFuncDeclarator.cfa: In function '_X4mainFi___1':
    2 identFuncDeclarator.cfa:116:9: note: #pragma message: Compiled
     1identFuncDeclarator.cfa:114:25: warning: Compiled

  • tests/.expect/init1-ERROR.nast.txt

    r82f4063 rbae0d35  
     1init1.cfa:134:25: warning: Compiled
    12init1.cfa:56:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
    23  Name: rx  InitAlternative: reference to signed int

  • tests/.expect/init1.txt

    r82f4063 rbae0d35  
    1 init1.cfa: In function '_X4mainFi___1':
    2 init1.cfa:136:9: note: #pragma message: Compiled
     1init1.cfa:134:25: warning: Compiled

  • tests/.expect/labelledExit.txt

    r82f4063 rbae0d35  
    1 labelledExit.cfa: In function '_X4mainFi_iPPKc__1':
    2 labelledExit.cfa:183:9: note: #pragma message: Compiled
     1labelledExit.cfa:181:25: warning: Compiled

  • tests/.expect/limits.txt

    r82f4063 rbae0d35  
    1 limits.cfa: In function '_X4mainFi_iPPKc__1':
    2 limits.cfa:154:9: note: #pragma message: Compiled
     1limits.cfa:152:25: warning: Compiled

  • tests/.expect/nested-types-ERR1.txt

    r82f4063 rbae0d35  
     1nested-types.cfa:100:25: warning: Compiled
    12nested-types.cfa:83:1 error: Use of undefined type T

  • tests/.expect/nested-types-ERR2.txt

    r82f4063 rbae0d35  
     1nested-types.cfa:100:25: warning: Compiled
    12nested-types.cfa:86:1 error: Use of undefined global type Z
    23nested-types.cfa:87:1 error: Qualified type requires an aggregate on the left, but has: signed int

  • tests/.expect/nested-types.txt

    r82f4063 rbae0d35  
    1 nested-types.cfa: In function '_X4mainFi___1':
    2 nested-types.cfa:102:9: note: #pragma message: Compiled
     1nested-types.cfa:100:25: warning: Compiled

  • tests/.expect/numericConstants.txt

    r82f4063 rbae0d35  
    1 numericConstants.cfa: In function '_X4mainFi___1':
    2 numericConstants.cfa:68:9: note: #pragma message: Compiled
     1numericConstants.cfa:66:25: warning: Compiled

  • tests/.expect/quasiKeyword.txt

    r82f4063 rbae0d35  
    1 quasiKeyword.cfa: In function '_X4mainFi_iPPKc__1':
    2 quasiKeyword.cfa:56:9: note: #pragma message: Compiled
     1quasiKeyword.cfa:54:25: warning: Compiled

  • tests/.expect/switch.txt

    r82f4063 rbae0d35  
    1 switch.cfa: In function '_X4mainFi___1':
    2 switch.cfa:105:9: note: #pragma message: Compiled
     1switch.cfa:103:25: warning: Compiled

  • tests/.expect/typedefRedef-ERR1.txt

    r82f4063 rbae0d35  
     1typedefRedef.cfa:69:25: warning: Compiled
    12typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo
    23typedefRedef.cfa:59:1 error: Cannot redefine typedef: ARR

  • tests/.expect/typedefRedef.txt

    r82f4063 rbae0d35  
    1 typedefRedef.cfa: In function '_X4mainFi___1':
    2 typedefRedef.cfa:71:9: note: #pragma message: Compiled
     1typedefRedef.cfa:69:25: warning: Compiled

  • tests/.expect/variableDeclarator.txt

    r82f4063 rbae0d35  
    1 variableDeclarator.cfa: In function '_X4mainFi_iPPKc__1':
    2 variableDeclarator.cfa:182:9: note: #pragma message: Compiled
     1variableDeclarator.cfa:180:25: warning: Compiled

  • tests/Makefile.am

    r82f4063 rbae0d35  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Mar  2 21:39:01 2021
    14 ## Update Count     : 90
     13## Last Modified On : Sat Jun  5 14:49:25 2021
     14## Update Count     : 92
    1515###############################################################################
    1616
    … …  
    173173
    174174SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
    175         init1 limits nested-types stdincludes cast labelledExit array quasiKeyword include/includes builtins/sync warnings/self-assignment
     175        init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment
    176176$(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
    177177        $(CFACOMPILE_SYNTAX)

  • tests/array.cfa

    r82f4063 rbae0d35  
    1111// Created On       : Tue Feb 19 21:18:06 2019
    1212// Last Modified By : Peter A. Buhr
    13 // Last Modified On : Sun Sep 27 09:05:40 2020
    14 // Update Count     : 4
     13// Last Modified On : Sat Jun  5 10:05:51 2021
     14// Update Count     : 5
    1515//
    1616
    … …  
    5050
    5151int main() {
    52         #if !defined(NO_COMPILED_PRAGMA)
    53                 #pragma message( "Compiled" )   // force non-empty .expect file
    54         #endif
     52    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    5553}
    5654

  • tests/builtins/.expect/sync.txt

    r82f4063 rbae0d35  
    1 builtins/sync.cfa: In function '_X4mainFi___1':
    2 builtins/sync.cfa:358:9: note: #pragma message: Compiled
     1builtins/sync.cfa:356:25: warning: Compiled

  • tests/builtins/sync.cfa

    r82f4063 rbae0d35  
    354354
    355355int main() {
    356         #pragma message( "Compiled" )                   // force non-empty .expect file
     356    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    357357}

  • tests/cast.cfa

    r82f4063 rbae0d35  
    1414//Dummy main
    1515int main( int argc, char const * argv[] ) {
    16         #pragma message( "Compiled" )                   // force non-empty .expect file
     16    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    1717}

  • tests/concurrent/.expect/sleep.txt

    r82f4063 rbae0d35  
    11start
    2 fast loop 0.047
    3 fast loop 0.094
    4 fast loop 0.141
    5 fast loop 0.188
    6 fast loop 0.235
    7 slow loop 0.277
    8 fast loop 0.282
    9 fast loop 0.329
    10 fast loop 0.376
    11 fast loop 0.423
    12 fast loop 0.47
    13 fast loop 0.517
    14 slow loop 0.554
    15 fast loop 0.564
    16 fast loop 0.611
    17 fast loop 0.658
    18 fast loop 0.705
    19 fast loop 0.752
    20 fast loop 0.799
    21 slow loop 0.831
    22 fast loop 0.846
    23 fast loop 0.893
    24 fast loop 0.94
    25 slow loop 1.108
    262done

  • tests/concurrent/sleep.cfa

    r82f4063 rbae0d35  
    77}
    88
     9volatile int counter = 0;
     10
    911thread fast_sleeper {};
    1012void main(fast_sleeper &) {
    … …  
    1214        for(i; 20) {
    1315                sleep(wait);
    14                 sout | acquire | "fast loop" | ((1 + i) * wait);
     16                __atomic_fetch_add( &counter, 1, __ATOMIC_RELAXED );
    1517        }
    1618}
    … …  
    2022        Duration wait = 277`ms;
    2123        for(i; 4) {
    22 
    2324                sleep(wait);
    24                 sout | acquire | "slow loop" | ((1 + i) * wait);
     25                int val = __atomic_add_fetch( &counter, -5, __ATOMIC_RELAXED );
     26                if(val < -9) abort | "Value reached negative value:" | val;
    2527        }
    2628}

  • tests/expression.cfa

    r82f4063 rbae0d35  
    8484        (S)@{2}`mary;
    8585
    86         #if !defined(NO_COMPILED_PRAGMA)
    87                 #pragma message( "Compiled" )   // force non-empty .expect file
    88         #endif
     86    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    8987} // main

  • tests/forall.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Wed May  9 08:48:15 2018
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 08:43:20 2020
    13 // Update Count     : 35
     12// Last Modified On : Sat Jun  5 10:06:08 2021
     13// Update Count     : 36
    1414//
    1515
    … …  
    214214
    215215int main( void ) {
    216         #pragma message( "Compiled" )                   // force non-empty .expect file
     216    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    217217}
    218218

  • tests/identFuncDeclarator.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Wed Aug 17 08:36:34 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 08:20:46 2020
    13 // Update Count     : 5
     12// Last Modified On : Sat Jun  5 10:06:25 2021
     13// Update Count     : 6
    1414//
    1515
    … …  
    112112        int (* const(* const f81)(int))();
    113113
    114         #pragma message( "Compiled" )                   // force non-empty .expect file
     114    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    115115}
    116116

  • tests/include/.expect/includes.nast.txt

    r82f4063 rbae0d35  
    1 include/includes.cfa: In function '_X4mainFi_iPPKc__1':
    2 include/includes.cfa:156:9: note: #pragma message: Compiled
     1include/includes.cfa:154:25: warning: Compiled

  • tests/include/includes.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Mar 25 09:08:26 2021
    13 // Update Count     : 750
     12// Last Modified On : Sat Jun  5 10:06:46 2021
     13// Update Count     : 751
    1414//
    1515
    … …  
    152152
    153153int main( int argc, char const *argv[] ) {
    154         #pragma message( "Compiled" )                                           // force non-empty .expect file
     154    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    155155}
    156156

  • tests/include/stdincludes.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Tue Aug 29 08:26:14 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 08:51:38 2020
    13 // Update Count     : 8
     12// Last Modified On : Sat Jun  5 10:08:11 2021
     13// Update Count     : 9
    1414//
    1515
    … …  
    4848
    4949int main() {
    50         #pragma message( "Compiled" )                   // force non-empty .expect file
     50    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    5151}
    5252

  • tests/init1.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Thu Jul 16 22:00:00 2020
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Oct 11 10:26:50 2020
    13 // Update Count     : 8
     12// Last Modified On : Sat Jun  5 10:06:57 2021
     13// Update Count     : 9
    1414//
    1515
    … …  
    132132
    133133int main() {
    134     #pragma message( "Compiled" )                       // force non-empty .expect file
     134    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    135135}

  • tests/labelledExit.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Wed Aug 10 07:29:39 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 09:01:34 2020
    13 // Update Count     : 12
     12// Last Modified On : Sat Jun  5 10:07:34 2021
     13// Update Count     : 13
    1414//
    1515
    … …  
    179179
    180180int main( int argc, char const *argv[] ) {
    181         #pragma message( "Compiled" )                                           // force non-empty .expect file
     181    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    182182}
    183183

  • tests/limits.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Tue May 10 20:44:20 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 08:45:43 2020
    13 // Update Count     : 10
     12// Last Modified On : Sat Jun  5 10:07:32 2021
     13// Update Count     : 11
    1414//
    1515
    … …  
    150150
    151151int main(int argc, char const *argv[]) {
    152         #pragma message( "Compiled" )                                           // force non-empty .expect file
     152    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    153153}
    154154

  • tests/nested-types.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Mon Jul 9 10:20:03 2018
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 08:48:59 2020
    13 // Update Count     : 6
     12// Last Modified On : Sat Jun  5 10:07:42 2021
     13// Update Count     : 7
    1414//
    1515
    … …  
    9898        // A.N(int) x;  // xxx - should not be an error, but currently is.
    9999
    100         #pragma message( "Compiled" )                   // force non-empty .expect file
     100    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    101101}
    102102

  • tests/numericConstants.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Wed May 24 22:10:36 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 07:55:22 2020
    13 // Update Count     : 7
     12// Last Modified On : Sat Jun  5 10:07:52 2021
     13// Update Count     : 8
    1414//
    1515
    … …  
    6464        0x_1.ffff_ffff_p_128_l;
    6565
    66         #pragma message( "Compiled" )   // force non-empty .expect file
     66    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    6767} // main
    6868

  • tests/pybin/tools.py

    r82f4063 rbae0d35  
    387387        # make a directory for this test
    388388        # mkdir makes the parent directory only so add a dummy
    389         mkdir(os.path.join(dst, name ))
     389        mkdir( os.path.join(dst, "core") )
    390390
    391391        # moves the files
    392392        mv( core, os.path.join(dst, "core" ) )
    393         mv( exe , os.path.join(dst, name   ) )
     393        mv( exe , os.path.join(dst, "exe"  ) )
    394394
    395395        # return explanatory test

  • tests/quasiKeyword.cfa

    r82f4063 rbae0d35  
    88// Created On       : Wed Feb 17 10:33:49 2021
    99// Last Modified By : Peter A. Buhr
    10 // Last Modified On : Sun Feb 21 15:52:04 2021
    11 // Update Count     : 7
     10// Last Modified On : Sat Jun  5 10:07:59 2021
     11// Update Count     : 8
    1212//
    1313
    … …  
    5252        else catch = 3;
    5353
    54         #pragma message( "Compiled" )                                           // force non-empty .expect file
     54    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    5555}

  • tests/switch.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Tue Jul 12 06:50:22 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 08:35:02 2020
    13 // Update Count     : 43
     12// Last Modified On : Sat Jun  5 10:08:20 2021
     13// Update Count     : 44
    1414//
    1515
    … …  
    101101        } // choose
    102102
    103         #pragma message( "Compiled" )                                           // force non-empty .expect file
     103    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    104104} // main
    105105

  • tests/typedefRedef.cfa

    r82f4063 rbae0d35  
    6767        typedef int *** pt;
    6868
    69         #pragma message( "Compiled" )                   // force non-empty .expect file
     69    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    7070}

  • tests/unified_locking/fast.cfa

    r82f4063 rbae0d35  
    88        fast_lock l;
    99        $thread * id;
    10         size_t sum;
     10        uint32_t sum;
    1111};
    1212
    … …  
    2020}
    2121
    22 unsigned cs() {
     22uint32_t cs() {
    2323        $thread * me = active_thread();
    24         unsigned value = (unsigned)me;
     24        uint32_t value = (uint32_t)me;
    2525        lock(mo.l);
    2626        {
    27                 size_t tsum = mo.sum;
     27                uint32_t tsum = mo.sum;
    2828                mo.id = me;
    2929                yield(random(5));
    … …  
    3636
    3737thread LockCheck {
    38         size_t sum;
     38        uint32_t sum;
    3939};
    4040
    … …  
    5050
    5151int main() {
    52         size_t sum = -32;
     52        uint32_t sum = -32;
    5353        mo.sum = -32;
    5454        processor p[2];

  • tests/unified_locking/timeout_lock.cfa

    r82f4063 rbae0d35  
    11#include <stdio.h>
    2 #include "locks.hfa"
    3 #include "alarm.hfa"
     2#include <locks.hfa>
     3#include <alarm.hfa>
    44#include <stdlib.hfa>
    55#include <thread.hfa>
    6 #include "kernel.cfa"
     6#include <kernel.hfa>
    77
    88multiple_acquisition_lock m, n;
    … …  
    3333
    3434        for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
    35             if ( wait( c_m, m, 1000000`ns ) ) { 
     35            if ( wait( c_m, m, 1000000`ns ) ) {
    3636                        // printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
    3737            } else {
    … …  
    7373        processor p[2];
    7474        printf("Start Test 1: surface testing condition variable timeout routines\n");
    75         wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );       
     75        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );
    7676        wait( c_m, 10, 1`ns );                                                                                                  // bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
    7777        lock(m); wait( c_m, m, 1`ns ); unlock(m);                                                               // bool wait( condition_variable(L) & this, L & l, Duration duration );

  • tests/variableDeclarator.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Wed Aug 17 08:41:42 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 07:46:17 2020
    13 // Update Count     : 13
     12// Last Modified On : Sat Jun  5 10:08:47 2021
     13// Update Count     : 14
    1414//
    1515
    … …  
    178178//Dummy main
    179179int main( int argc, char const * argv[] ) {
    180         #pragma message( "Compiled" )                                           // force non-empty .expect file
     180    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    181181}
    182182

  • tests/warnings/.expect/self-assignment.nast.txt

    r82f4063 rbae0d35  
     1warnings/self-assignment.cfa:34:25: warning: Compiled
    12warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Generated Cast of:
    23  Variable Expression: j: signed int
    … …  
    4647... with resolved type:
    4748  reference to signed int
    48 warnings/self-assignment.cfa: In function '_X4mainFi___1':
    49 warnings/self-assignment.cfa:36:9: note: #pragma message: Compiled

  • tests/warnings/self-assignment.cfa

    r82f4063 rbae0d35  
    1010// Created On       : Thu Mar 1 13:53:57 2018
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Sep 27 09:24:34 2020
    13 // Update Count     : 6
     12// Last Modified On : Sat Jun  5 10:08:56 2021
     13// Update Count     : 7
    1414//
    1515
    … …  
    3232        t.s.i = t.s.i;
    3333
    34         #pragma message( "Compiled" )                   // force non-empty .expect file
     34    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
    3535}
    3636
Note: See TracChangeset for help on using the changeset viewer.