Changeset 4e1572f for src/tests


Ignore:
Timestamp:
Jul 26, 2018, 5:21:03 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
dccad9f
Parents:
56de5932 (diff), a95c117 (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:
src/tests
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • src/tests/.expect/alloc-ERROR.txt

    r56de5932 r4e1572f  
    1 alloc.c:264:1 error: No reasonable alternatives for expression Applying untyped:
     1alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped:
    22  Name: ?=?
    33...to:
    … …  
    1919
    2020
    21 alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped:
     21alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped:
    2222  Name: ?=?
    2323...to:
    … …  
    3939
    4040
    41 alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped:
     41alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped:
    4242  Name: ?=?
    4343...to:
    … …  
    5050
    5151
    52 alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped:
     52alloc.c:268:1 error: No reasonable alternatives for expression Applying untyped:
    5353  Name: ?=?
    5454...to:

  • src/tests/alloc.c

    r56de5932 r4e1572f  
    1010// Created On       : Wed Feb  3 07:56:22 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Feb 16 15:42:31 2018
    13 // Update Count     : 330
     12// Last Modified On : Wed Jul 25 09:09:43 2018
     13// Update Count     : 331
    1414//
    1515
    … …  
    5454        p = alloc( fill );                                  // CFA alloc, fill
    5555        printf( "CFA alloc, fill %08x\n", *p );
     56        free( p );
    5657
    5758

  • src/tests/pybin/test_run.py

    r56de5932 r4e1572f  
    2828
    2929        def prepare(self):
    30                 sh("mkdir -p %s" % os.path.join(self.path, '.err'))
    31                 sh("mkdir -p %s" % os.path.join(self.path, '.out'))
    32                 sh("mkdir -p %s" % os.path.join(self.path, '.in' ))
     30                mkdir( (self.output_log(), self.error_log(), self.input()            ) )
     31                rm   ( (self.output_log(), self.error_log(), self.target_executable()) )
    3332
    3433        def expect(self):
    35                 return ("%s.expect/%s%s.txt" % (os.path.join(settings.SRCDIR, self.path), self.name, '' if not self.arch else ".%s" % self.arch))
     34                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s.txt" % (self.name,'' if not self.arch else ".%s" % self.arch)) )
    3635
    3736        def error_log(self):
    38                 return ("%s.err/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
     37                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".err"   , "%s.log" % self.name) )
    3938
    4039        def output_log(self):
    41                 return ("%s.out/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
     40                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".out"   , "%s.log" % self.name) )
    4241
    4342        def input(self):
    44                 return ("%s.in/%s.txt"     % (os.path.join(settings.SRCDIR, self.path), self.name))
     43                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".in"    , "%s.txt" % self.name) )
    4544
    4645        def target_output(self):
    … …  
    4847
    4948        def target(self):
    50                 return os.path.join(self.path, self.name)
     49                return os.path.normpath( os.path.join(self.path, self.name) )
    5150
    5251        def target_executable(self):
    53                 return os.path.join(settings.BUILDDIR, self.path, self.name)
     52                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
    5453
    5554        @classmethod
    … …  
    6160                test = Test()
    6261                test.name = os.path.basename(target)
    63                 test.path = os.path.dirname (target)
     62                test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
    6463                test.arch = settings.arch.toString() if settings.arch.cross_compile else ''
    6564                return test

  • src/tests/pybin/tools.py

    r56de5932 r4e1572f  
    5757        except TypeError:
    5858                sh("rm -f %s > /dev/null 2>&1" % files )
     59
     60# Create 1 or more directory
     61def mkdir( files ):
     62        try:
     63                for file in files:
     64                        sh("mkdir -p %s" % os.path.dirname(file) )
     65        except TypeError:
     66                sh("mkdir -p %s" % os.path.dirname(files) )
    5967
    6068def chdir( dest = __main__.__file__ ):

  • src/tests/structMember.c

    r56de5932 r4e1572f  
    1 typedef int T;
     1typedef int TD;
     2extern struct TTT {};
    23
    34struct S {
    … …  
    89        int m4, m5, m6;
    910        int *m7, *m8, *m9;
    10         int (*m10)();
    11         int *(*m11)(int);
    12         T (T);
     11        __extension__ int (*m10)();
     12        __extension__ int *(*m11)(int);
     13//      TD (TD);
    1314
    14 // Cforall extensions
     15// Cforall declarations
    1516
    1617        * int m12, m13;
    1718        * [ * int ] (int) m14;
    18         int ;
    19         int , , ;
    20         int * , , ;
    21         int *, *, *;
    22         * int , , ;
    23         int (*)();
    24         int (**)( int );
    25         T ;
    2619
    27 // errors
     20// C anonymous declarations (padding)
    2821
    29 //    void f(void);
     22        int :4;
     23        int :4, :6;
     24
     25// Cforall anonymous declarations (padding)
     26
     27        int @;
     28        TD @;
     29        int @, @, @;
     30        int * @ , @, @;
     31        int * @, * @, * @;
     32        * int @, @, @;
     33        struct TTT @;
     34        TTT @, @;
     35        int @ :4, @ :6;
     36        * int @, @;
     37        int (*@)();
     38        int (*@)(int), (*@)(int);
     39        * [int](int) @, @;
     40        int (**@)( int );
     41        * * [int](int) @;
     42
     43// C aggregate open declarations
     44
     45        __extension__ union { int i; };
     46        struct T { int k; };
     47
     48// Cforall forward declaration
     49
     50        struct PPP;
     51        __extension__ struct QQQ;
     52
     53// C useless declarations
     54
     55        int;
     56        TD;
     57        unsigned int;
     58        __extension__ long double;
     59        _Complex;
     60        double _Complex;
     61        volatile zero_t;
     62        const one_t;
     63        S;
     64        .S;
     65        S.T;
     66        .S.T;
     67        forall( otype S, otype T ) struct W {
     68                struct X {};
     69        };
     70        W(int);
     71        W(int).X;
    3072};
    3173
    3274struct S s;
     75
     76// Cforall Plan 9 declarations
     77
     78struct UUU {};
     79extern struct SSS {
     80        inline struct WWW {};
     81        inline UUU;
     82        inline UUU *, **;
     83        inline UUU (*)( int p );
     84        inline int;
     85        inline int *;
     86        inline * int;
     87        inline int (*)( int p );
     88        inline * [int](int p);
     89};
    3390
    3491union U {

  • src/tests/test.py

    r56de5932 r4e1572f  
    6464                        testname = canonicalPath( testname )
    6565                        if Test.valid_name(testname):
    66                                 found = [test for test in allTests if test.target() == testname]
     66                                found = [test for test in allTests if canonicalPath( test.target() ) == testname]
    6767                                tests.append( found[0] if len(found) == 1 else Test.from_target(testname) )
    6868                        else :
    … …  
    137137        test.prepare()
    138138
    139         # remove any outputs from the previous tests to prevent side effects
    140         rm( (out_file, err_file, exe_file) )
    141 
    142139        # build, skipping to next test on error
    143140        before = time.time()
Note: See TracChangeset for help on using the changeset viewer.