Changeset 9b443c7f for Jenkinsfile

Timestamp:

Mar 15, 2017, 5:02:25 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

f2e40a9f

Parents:

5a3ac84 (diff), 29f44a74 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -13 +13 @@
 
         compiler                = null
+        arch_name               = ''
         architecture    = ''
         
@@ -130 +131 @@
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also builds documentation',              \
-                                        name: 'pBuildDocumentation',                                                            \
+                                        name: 'pBuildDocumentation',                                                    \
                                         defaultValue: true,                                                             \
                                 ],                                                                                              \
@@ -136 +137 @@
                                         description: 'If true, jenkins also publishes results',                 \
                                         name: 'pPublish',                                                               \
-                                        defaultValue: true,                                                             \
+                                        defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins will not send emails',           \
-                                        name: 'pSilent',                                                \
+                                        name: 'pSilent',                                                                        \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
@@ -147 +148 @@
 
         compiler                = compiler_from_params( pCompiler )
-        architecture    = architecture_from_params( pArchitecture )
+        arch_name               = pArchitecture
+        architecture    = architecture_from_params( arch_name )
 
         do_alltests             = (pRunAllTests == 'true')
@@ -156 +158 @@
 
         echo """Compiler                : ${compiler.cc_name} (${compiler.cpp_cc}/${compiler.cfa_cc})
-Architecture            : ${architecture}
+Architecture            : ${arch_name}
+Arc Flags               : ${architecture}
 Run All Tests           : ${ pRunAllTests.toString() }
 Run Benchmark           : ${ pRunBenchmark.toString() }
@@ -287 +290 @@
 
                 //Write the commit id to Benchmark
-                writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' 
+                writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' + arch_name + ','
  
                 //Append bench results