Changeset e5d9274 for tests


Ignore:
Timestamp:
Jun 2, 2022, 3:11:21 PM (3 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master, pthread-emulation, qualifiedEnum
Children:
ced5e2a
Parents:
015925a (diff), fc134a48 (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
14 edited

Legend:

Unmodified
Added
Removed
  • tests/.expect/attributes.nast.x64.txt

    r015925a re5d9274  
    13391339        }
    13401340
    1341         {
    1342             ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
    1343         }
    1344 
    1345         return _X4_retM12__anonymous4_2;
     1341        return (*_X4_dstM12__anonymous4_2);
    13461342    }
    13471343    {
  • tests/.expect/attributes.nast.x86.txt

    r015925a re5d9274  
    13391339        }
    13401340
    1341         {
    1342             ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
    1343         }
    1344 
    1345         return _X4_retM12__anonymous4_2;
     1341        return (*_X4_dstM12__anonymous4_2);
    13461342    }
    13471343    {
  • tests/.expect/attributes.oast.x64.txt

    r015925a re5d9274  
    13391339        }
    13401340
    1341         {
    1342             ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
    1343         }
    1344 
    1345         return _X4_retM12__anonymous4_2;
     1341        return (*_X4_dstM12__anonymous4_2);
    13461342    }
    13471343    {
  • tests/.expect/attributes.oast.x86.txt

    r015925a re5d9274  
    13391339        }
    13401340
    1341         {
    1342             ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
    1343         }
    1344 
    13451341        return _X4_retM12__anonymous4_2;
    13461342    }
  • tests/.expect/quasiKeyword.txt

    r015925a re5d9274  
    1 quasiKeyword.cfa:54:25: warning: Compiled
     1quasiKeyword.cfa:52:25: warning: Compiled
  • tests/exceptions/defaults.cfa

    r015925a re5d9274  
    22
    33#include <string.h>
    4 #include <exception.hfa>
    54
    65exception log_message {
     
    87};
    98
    10 _EHM_DEFINE_COPY(log_message, )
     9// Manually define the virtual table and helper functions.
     10void copy(log_message * this, log_message * that) {
     11        *this = *that;
     12}
     13
    1114const char * msg(log_message * this) {
    1215        return this->msg;
    1316}
    14 _EHM_VIRTUAL_TABLE(log_message, , log_vt);
     17
     18const struct log_message_vtable log_vt @= {
     19        .__cfavir_typeid : &__cfatid_log_message,
     20        .size : sizeof(struct log_message),
     21        .copy : copy,
     22        .^?{} : ^?{},
     23        .msg : msg,
     24};
    1525
    1626// Logging messages don't have to be handled.
  • tests/include/.expect/includes.nast.txt

    r015925a re5d9274  
    1 include/includes.cfa:169:25: warning: Compiled
     1include/includes.cfa:173:25: warning: Compiled
  • tests/include/includes.cfa

    r015925a re5d9274  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue May 10 16:36:44 2022
    13 // Update Count     : 776
     12// Last Modified On : Sun May 22 08:27:20 2022
     13// Update Count     : 779
    1414//
    1515
     
    4747#endif
    4848#include <execinfo.h>
    49 #include <expat.h>
     49#if __has_include( "expat.h" )
     50#include <expat.h>                                                                              // may not be installed
    5051#include <expat_external.h>
     52#endif
    5153#include <fcntl.h>
    5254#include <features.h>
     
    7981//#include <link.h>                                                                             // CFA bug #240 nested anonymous enum fails
    8082#include <locale.h>
    81 #include <ltdl.h>
     83#if __has_include( "ltdl.h" )
     84#include <ltdl.h>                                                                               // may not be installed
     85#endif
    8286//#include <malloc.h>                                                                   // cannot include in extern "C" because of CFA #include_next
    8387#include <math.h>
  • tests/linking/exception-nothreads.cfa

    r015925a re5d9274  
    1515
    1616#include <stdlib.hfa>
    17 #include <exception.hfa>
    1817
    19 EHM_EXCEPTION(ping)();
    20 EHM_VIRTUAL_TABLE(ping, ping_vt);
     18exception ping {};
     19vtable(ping) ping_vt;
    2120
    2221int main(void) {
  • tests/linking/exception-withthreads.cfa

    r015925a re5d9274  
    1515
    1616#include <stdlib.hfa>
    17 #include <exception.hfa>
    1817#include "../exceptions/with-threads.hfa"
    1918
    20 EHM_EXCEPTION(ping)();
    21 EHM_VIRTUAL_TABLE(ping, ping_vt);
     19exception ping {};
     20vtable(ping) ping_vt;
    2221
    2322int main(void) {
  • tests/pybin/settings.py

    r015925a re5d9274  
    201201        global output_width
    202202        output_width = max(map(lambda t: len(t.target()), tests))
     203        # 35 is the maximum width of the name field before we get line wrapping.
     204        output_width = min(output_width, 35)
  • tests/pybin/test_run.py

    r015925a re5d9274  
    4343                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
    4444
     45        def format_target(self, width):
     46                target = self.target()
     47                length = len(target)
     48                if length < width:
     49                        return '{0:{width}}'.format(target, width=width)
     50                elif length == width:
     51                        return target
     52                else:
     53                        return '...' + target[3-width:]
     54
    4555        @staticmethod
    4656        def valid_name(name):
  • tests/quasiKeyword.cfa

    r015925a re5d9274  
    44// quasiKeyword.cfa -- test that quasi-keywords can be used for variable and functions names, as well as keywords in
    55//                                         control structures.
    6 // 
     6//
    77// Author           : Peter A. Buhr
    88// Created On       : Wed Feb 17 10:33:49 2021
     
    1010// Last Modified On : Sat Jun  5 10:07:59 2021
    1111// Update Count     : 8
    12 // 
     12//
    1313
    14 #include <exception.hfa>
    15 
    16 EHM_EXCEPTION( E )();
     14exception E {};
    1715
    1816void catch( int i ) {}
     
    4947                } fixup ( E * ) {
    5048                } finally {
    51                 } 
     49                }
    5250        else catch = 3;
    5351
  • tests/test.py

    r015925a re5d9274  
    132132        parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=comma_separated(yes_no), default='no')
    133133        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_')
    134         parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=120)
     134        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=180)
    135135        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)
    136136        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")
     
    252252        try :
    253253                # print formated name
    254                 name_txt = '{0:{width}}  '.format(t.target(), width=settings.output_width)
     254                name_txt = t.format_target(width=settings.output_width) + '  '
    255255
    256256                retcode, error, duration = run_single_test(t)
Note: See TracChangeset for help on using the changeset viewer.