Changes in Jenkinsfile [4f3807d:9a90092]

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -103 +103 @@
                         }
 
-                        ast = Settings.NewAST ? "--enable-new-ast" : "--disable-new-ast"
-
-                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} AR=gcc-ar RANLIB=gcc-ranlib ${targets} ${ast} --quiet --prefix=${BuildDir}"
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} AR=gcc-ar RANLIB=gcc-ranlib ${targets} --quiet --prefix=${BuildDir}"
 
                         // Configure libcfa
@@ -152 +150 @@
                 sh 'ulimit -a'
 
-                Tools.BuildStage('Test: short', !Settings.RunAllTests) {
+                jopt = '-j $(nproc)'
+
+                Tools.BuildStage('Test: Debug', true) {
                         dir (BuildDir) {
                                 //Run the tests from the tests directory
-                                sh "make --no-print-directory -C tests archiveerrors=${BuildDir}/tests/crashes/short"
+                                sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
                         }
                 }
 
-                Tools.BuildStage('Test: full', Settings.RunAllTests) {
+                Tools.BuildStage('Test: Release', Settings.RunAllTests) {
                         dir (BuildDir) {
-                                        jopt = '-j $(nproc)'
-                                        if( Settings.Architecture.node == 'x86' ) {
-                                                jopt = '-j2'
-                                        }
-                                        //Run the tests from the tests directory
-                                        sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
-                                        sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
+                                //Run the tests from the tests directory
+                                sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
                         }
                 }
@@ -281 +276 @@
         public final CC_Desc Compiler
         public final Arch_Desc Architecture
-        public final Boolean NewAST
         public final Boolean RunAllTests
         public final Boolean RunBenchmark
@@ -339 +333 @@
 
                 this.IsSandbox          = (branch == "jenkins-sandbox")
-                this.NewAST             = param.NewAST
                 this.RunAllTests        = param.RunAllTests
                 this.RunBenchmark       = param.RunBenchmark
@@ -349 +342 @@
                 this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
 
-                final ast = this.NewAST ? "New AST" : "Old AST"
                 this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
-AST Version             : ${ ast.toString() }
 Architecture            : ${ this.Architecture.name }
 Arc Flags               : ${ this.Architecture.flags }
@@ -390 +381 @@
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, build compiler using new AST',           \
-                                        name: 'NewAST',                                                                         \
-                                        defaultValue: true,                                                             \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If false, only the quick test suite is ran',              \
+                                        description: 'If false, the test suite is only ran in debug',   \
                                         name: 'RunAllTests',                                                            \
                                         defaultValue: false,                                                            \