Changeset 1b6a23e

Timestamp:

Jul 11, 2016, 12:02:34 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

3fedd29

Parents:

0fd6926

Message:

Modified string options to try debug wierd null-pointer error

File:

• Jenkinsfile (modified) (1 diff)

Jenkinsfile

@@ -180 +180 @@
                                         ],                                                                      \
                                         [$class: 'ParametersDefinitionProperty',                                \
-                                                parameterDefinitons : [                                         \
+                                                parameterDefinitons: [                                          \
                                                 [$class: 'ChoiceParameterDefinition',                           \
-                                                  choices : ['64-bit', '32-bit'],                               \
-                                                  description : 'The architecture to use for compilation',      \
-                                                  name : 'buildArchitecture'                                    \
+                                                  choices: ['64bit', '32bit'],                          \
+                                                  description: 'The architecture to use for compilation',       \
+                                                  name: 'buildArchitecture'                                     \
                                                 ]]                                                              \
                                         ]])
 
                                 doPromoteBuild2DoLang = promoteBuild2DoLang == 'true'
-                                architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
+
 
                                 echo "FULL BUILD = ${doPromoteBuild2DoLang}"
+                                
+                                architectureFlag = buildArchitecture == '64bit' ? '-m64' : (buildArchitecture == '32bit' ? '-m32' : 'ERROR')
                                 echo "Architecture = ${buildArchitecture} (flag ${architectureFlag})"
                                 echo