Changeset 8fa3c7e6 for Jenkinsfile

Timestamp:

Feb 22, 2017, 5:02:53 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:

692de479

Parents:

b3e9729

Message:

Fixed full build script with new changes

File:

• Jenkinsfile (modified) (2 diffs)

Jenkinsfile

@@ -113 +113 @@
                                         description: 'The target architecture',                                 \
                                         name: 'pArchitecture',                                                          \
-                                        choices: '64-bit\n32-bit',                                                      \
-                                        defaultValue: '64-bit',                                                         \
+                                        choices: 'x64\nx86',                                                            \
+                                        defaultValue: 'x64',                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If false, only the quick test suite is ran',              \
-                                        name: 'pRunAllTests',                                                   \
+                                        name: 'pRunAllTests',                                                           \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also runs benchmarks',           \
-                                        name: 'pRunBenchmark',                                                  \
+                                        name: 'pRunBenchmark',                                                          \
                                         defaultValue: true,                                                             \
                                 ],                                                                                              \
@@ -219 +219 @@
 def architecture_from_params( arch ) {
         switch( arch ) {
-                case '64-bit':
+                case 'x64':
                         return '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"'
                 break
-                case '32-bit':
+                case 'x86':
                         return '--host=i386   CXXFLAGS="-m32" CFAFLAGS="-m32"'
                 break