Changeset 92538ab for Jenkinsfile

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -108 +108 @@
 
                         // Configure libcfa
-                        sh 'make -j 8 --no-print-directory configure-libcfa'
+                        sh 'make -j $(nproc) --no-print-directory configure-libcfa'
                 }
         }
@@ -116 +116 @@
                 dir (BuildDir) {
                         // Build driver
-                        sh 'make -j 8 --no-print-directory -C driver'
+                        sh 'make -j $(nproc) --no-print-directory -C driver'
 
                         // Build translator
-                        sh 'make -j 8 --no-print-directory -C src'
+                        sh 'make -j $(nproc) --no-print-directory -C src'
                 }
         }
@@ -126 +126 @@
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
-                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-debug"
+                        sh "make -j \$(nproc) --no-print-directory -C libcfa/${Settings.Architecture.name}-debug"
                 }
         }
@@ -133 +133 @@
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
-                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-nodebug"
+                        sh "make -j \$(nproc) --no-print-directory -C libcfa/${Settings.Architecture.name}-nodebug"
                 }
         }
@@ -140 +140 @@
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
-                        sh "make -j 8 --no-print-directory install"
+                        sh 'make -j $(nproc) --no-print-directory install'
                 }
         }
@@ -161 +161 @@
                 Tools.BuildStage('Test: full', Settings.RunAllTests) {
                         dir (BuildDir) {
-                                        jopt = ""
+                                        jopt = '-j $(nproc)'
                                         if( Settings.Architecture.node == 'x86' ) {
-                                                jopt = "-j2"
+                                                jopt = '-j2'
                                         }
                                         //Run the tests from the tests directory