Changeset 6802a5f for Jenkinsfile


Ignore:
Timestamp:
Feb 22, 2017, 2:52:43 PM (8 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
1e6a463
Parents:
bd34bcf5
Message:

Add echo to validate parameters

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rbd34bcf5 r6802a5f  
    146146        do_publish              = param_publish         .toBoolean()
    147147
     148        echo """Compiler                        : ${compiler.name} (${compiler.cpp_cc}/${compiler.cfa_cc})
     149Architecture            : ${architecture}
     150Run All Tests           : ${ param_allTests.toString() }
     151Run Benchmark           : ${ param_benchmark.toString() }
     152Build Documentation     : ${ param_doc.toString() }
     153Publish                 : ${ param_publish.toString() }
     154"""
     155
    148156        collect_git_info()
    149157}
     
    172180        public String cc_name
    173181        public String cpp_cc
    174         public String cfa_backend_cc
    175 
    176         CC_Desc(String cc_name, String cpp_cc, String cfa_backend_cc) {
     182        public String cfa_cc
     183
     184        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
    177185                this.cc_name = cc_name
    178186                this.cpp_cc = cpp_cc
    179                 this.cfa_backend_cc = cfa_backend_cc
     187                this.cfa_cc = cfa_cc
    180188        }
    181189}
     
    193201                break
    194202                case 'clang':
    195                         return new CC_Desc('gcc-6', 'clang', 'gcc-6')
     203                        return new CC_Desc('clang', 'clang++', 'gcc-6')
    196204                break
    197205                default
     
    238246                //escapes the sandbox
    239247                //Also specify the compiler by hand
    240                 sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
     248                sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
    241249
    242250                //Compile the project
Note: See TracChangeset for help on using the changeset viewer.