Changeset 466149d


Ignore:
Timestamp:
Jun 27, 2016, 4:26:38 PM (9 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
22cad76
Parents:
b9be079b (diff), e7ce55e (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:
1 edited
58 moved

Legend:

Unmodified
Added
Removed

  • src/tests/.expect/castError.txt

    rb9be079b r466149d  
    4040
    4141
    42 make: *** [CastError] Error 1
     42make: *** [castError] Error 1

  • src/tests/.expect/constant0-1DP.txt

    rb9be079b r466149d  
    3232Error: duplicate object definition for x: const pointer to pointer to signed int
    3333Error: duplicate object definition for 0: pointer to pointer to signed int
    34 make: *** [Constant0-1DP] Error 1
     34make: *** [constant0-1DP] Error 1

  • src/tests/.expect/constant0-1NDDP.txt

    rb9be079b r466149d  
    1616Error: duplicate object definition for x: const pointer to signed int
    1717Error: duplicate object definition for 0: const pointer to signed int
    18 make: *** [Constant0-1NDDP] Error 1
     18make: *** [constant0-1NDDP] Error 1

  • src/tests/.expect/declarationErrors.txt

    rb9be079b r466149d  
    1414Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int
    1515
    16 make: *** [DeclarationErrors] Error 1
     16make: *** [declarationErrors] Error 1

  • src/tests/.expect/declarationSpecifier.txt

    rb9be079b r466149d  
    1414Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int
    1515
    16 make: *** [DeclarationSpecifier] Error 1
     16make: *** [declarationSpecifier] Error 1

  • src/tests/.expect/labelledExit.txt

    rb9be079b r466149d  
    11CFA Version 1.0.0 (debug)
    22Error: 'break' outside a loop or switch
    3 make: *** [LabelledExit] Error 1
     3make: *** [labelledExit] Error 1

  • src/tests/.expect/scopeErrors.txt

    rb9be079b r466149d  
    99    CompoundStmt
    1010
    11 make: *** [ScopeErrors] Error 1
     11make: *** [scopeErrors] Error 1

  • src/tests/test.py

    rb9be079b r466149d  
    6161
    6262        # build, skipping to next test on error
    63         make_ret = sh("make -j 8 %s 2> %s 1> /dev/null" % (test, out_file), dry_run)
     63        make_ret = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
    6464
    6565        if make_ret == 0 :
    … …  
    8484
    8585def run_tests(tests, generate, dry_run) :
    86         sh('make clean > /dev/null 2>&1', dry_run)
     86        sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
    8787        sh('mkdir -p .out .expect', dry_run)
    8888
    … …  
    102102                        print( "Done" )
    103103
    104         sh('make clean > /dev/null 2>&1', dry_run)
     104        sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
    105105
    106106        return 1 if failed else 0
    … …  
    141141                sys.exit(1)
    142142
     143tests.sort()
     144make_flags = environ.get('MAKEFLAGS')
     145make_cmd = "make" if make_flags and "-j" in make_flags else "make -j8"
     146
    143147if options.list :
    144148        print("\n".join(tests))
Note: See TracChangeset for help on using the changeset viewer.