Changeset 8b52686


Ignore:
Timestamp:
Jun 22, 2016, 4:35:42 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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:
e7aed49
Parents:
10dc7491 (diff), b015035 (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 plg2:software/cfa/cfa-cc

Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r10dc7491 r8b52686  
    3333                dir ('src/tests') {
    3434                        if (full_build) {
    35                                 sh 'python test.py --all'
     35                                sh 'make all-tests'
    3636                        }
    3737                        else {
    38                                 sh './runTests.sh'
     38                                sh 'make'
    3939                        }
    4040                }
     
    188188                                cfa_build(doPromoteBuild2DoLang)
    189189
    190                                 //Compile using gcc-5
    191                                 currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
    192                                 cfa_build(doPromoteBuild2DoLang)
    193 
    194                                 //Compile using gcc-4.9
    195                                 currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
    196                                 cfa_build(doPromoteBuild2DoLang)
     190                                if( doPromoteBuild2DoLang ) {
     191                                        //Compile using gcc-5
     192                                        currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
     193                                        cfa_build(true)
     194
     195                                        //Compile using gcc-4.9
     196                                        currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
     197                                        cfa_build(true)
     198                                }
    197199
    198200                                //Compile latex documentation
  • src/tests/Makefile.am

    r10dc7491 r8b52686  
    2727
    2828all-local :
     29        python test.py vector_test avl_test Operators NumericConstants Expression Enum AsmName Array Typeof Cast
     30
     31all-tests :
    2932        python test.py --all
    3033
  • src/tests/Makefile.in

    r10dc7491 r8b52686  
    634634
    635635all-local :
     636        python test.py vector_test avl_test Operators NumericConstants Expression Enum AsmName Array Typeof Cast
     637
     638all-tests :
    636639        python test.py --all
    637640
  • src/tests/test.py

    r10dc7491 r8b52686  
    22from __future__ import print_function
    33
    4 from os import listdir
     4from os import listdir, environ
    55from os.path import isfile, join, splitext
    66from subprocess import Popen, PIPE, STDOUT
    77
    88import argparse
     9import os
     10import re
    911import sys
    1012
     
    2729                proc.communicate()
    2830                return proc.returncode
     31
     32def file_replace(fname, pat, s_after):
     33    # first, see if the pattern is even in the file.
     34    with open(fname) as f:
     35        if not any(re.search(pat, line) for line in f):
     36            return # pattern does not occur in file so we are done.
     37
     38    # pattern is in the file, so perform replace operation.
     39    with open(fname) as f:
     40        out_fname = fname + ".tmp"
     41        out = open(out_fname, "w")
     42        for line in f:
     43            out.write(re.sub(pat, s_after, line))
     44        out.close()
     45        os.rename(out_fname, fname)
     46
     47def fix_MakeLevel(file) :
     48        if environ.get('MAKELEVEL') :
     49                file_replace(file, "make\[%i\]" % int(environ.get('MAKELEVEL')), 'make' )
     50
    2951
    3052################################################################################
     
    4971
    5072        retcode = 0
     73
     74        fix_MakeLevel(out_file)
     75
    5176        if not generate :
    5277                # diff the output of the files
Note: See TracChangeset for help on using the changeset viewer.