Changeset 25296a3


Ignore:
Timestamp:
Jun 16, 2016, 12:24:50 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
14d2bdf
Parents:
0f8e4ac (diff), 245510f (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' into ctor

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r0f8e4ac r25296a3  
    2222
    2323                //Compile the project
    24                 sh 'make -j 8 V=0 install'
     24                sh 'make -j 8 --no-print-directory V=0 install'
    2525
    2626        build_stage 'Test'
  • src/tests/test.py

    r0f8e4ac r25296a3  
    3434def run_test_instance(test, dry_run):
    3535        sh("rm -f .out/%s.log" % test, dry_run)
    36         sh("rm -f %s" % test, dry_run)
     36        sh("rm -f %s > /dev/null 2>&1" % test, dry_run)
    3737
    3838        # build, skipping to next test on error
    39         sh("make -j 8 %s >> .out/%s.log 2>&1" % (test, test), dry_run)
     39        sh("make -j 1 %s >> .out/%s.log 2>&1" % (test, test), dry_run)
    4040
    4141        # fetch optional input
     
    5252
    5353        # clean the executable
    54         sh("rm -f %s" % test, dry_run)
     54        sh("rm -f %s > /dev/null 2>&1" % test, dry_run)
    5555
    5656        return retcode
     
    7676def generate_test_expect(test):
    7777        sh("rm -f .out/%s.log" % test, False)
    78         sh("rm -f %s" % test, False)
     78        sh("rm -f %s > /dev/null 2>&1" % test, False)
    7979
    8080        # build, skipping to next test on error
     
    8888
    8989        # clean the executable
    90         sh("rm -f %s" % test, False)
     90        sh("rm -f %s > /dev/null 2>&1" % test, False)
    9191
    9292def generate_expect(tests) :
Note: See TracChangeset for help on using the changeset viewer.