Changeset ea5b7d6


Ignore:
Timestamp:
Aug 10, 2018, 1:05:20 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
0c1b566
Parents:
455a7d5
Message:

Fixed jenkins after rework of automake

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r455a7d5 rea5b7d6  
    2828
    2929# src executables, for lib and bin
    30 src/driver/as
    31 src/driver/cfa
    32 src/driver/cfa-cpp
    33 src/driver/cc1
     30driver/as
     31driver/cfa
     32driver/cfa-cpp
     33driver/cc1
    3434
    35 src/prelude/bootloader.c
    36 src/prelude/builtins.cf
    37 src/prelude/extras.cf
    38 src/prelude/gcc-builtins.cf
    39 src/prelude/gcc-builtins.c
    40 src/prelude/prelude.cf
    41 src/libcfa/libcfa-prelude.c
     35libcfa/prelude/bootloader.c
     36libcfa/prelude/builtins.cf
     37libcfa/prelude/extras.cf
     38libcfa/prelude/gcc-builtins.cf
     39libcfa/prelude/gcc-builtins.c
     40libcfa/prelude/prelude.cf
     41libcfa/x64-debug/
     42libcfa/x64-nodebug/
     43libcfa/x64-nolib/
     44libcfa/x86-debug/
     45libcfa/x86-nodebug/
     46libcfa/x86-nolib/
     47libcfa/arm-debug/
     48libcfa/arm-nodebug/
     49libcfa/arm-nolib/
     50
    4251
    4352# generated by bison and lex from parser.yy and lex.ll
  • Jenkinsfile

    r455a7d5 rea5b7d6  
    277277                        //Use the current directory as the installation target so nothing escapes the sandbox
    278278                        //Also specify the compiler by hand
    279                         sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --enable-silent-rules --quiet"
     279                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --quiet"
    280280
    281281                        //Compile the project
     
    291291                        //Run the tests from the tests directory
    292292                        if ( do_alltests ) {
    293                                 sh 'make --no-print-directory -C src/tests all-tests debug=yes'
    294                                 sh 'make --no-print-directory -C src/tests all-tests debug=no '
     293                                sh 'make --no-print-directory -C tests all-tests debug=yes'
     294                                sh 'make --no-print-directory -C tests all-tests debug=no '
    295295                        }
    296296                        else {
    297                                 sh 'make --no-print-directory -C src/tests'
     297                                sh 'make --no-print-directory -C tests'
    298298                        }
    299299                }
     
    308308                dir (builddir) {
    309309                        //Append bench results
    310                         sh "make --no-print-directory -C src/benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
     310                        sh "make --no-print-directory -C benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
    311311                }
    312312        }
Note: See TracChangeset for help on using the changeset viewer.