Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision fa234ef82d9b7a35aeb464254c07da10d12b8eba)
+++ Jenkinsfile	(revision d5410577d0c8b539b34bc0b9543bc7f9eff75534)
@@ -33,8 +33,8 @@
 		dir ('src/tests') {
 			if (full_build) {
-				sh 'python test.py --all'
+				sh 'make all-tests'
 			}
 			else {
-				sh './runTests.sh'
+				sh 'make'
 			}
 		}
@@ -188,11 +188,13 @@
 				cfa_build(doPromoteBuild2DoLang)
 
-				//Compile using gcc-5
-				currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-				cfa_build(doPromoteBuild2DoLang)
-
-				//Compile using gcc-4.9
-				currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-				cfa_build(doPromoteBuild2DoLang)
+				if( doPromoteBuild2DoLang ) {
+					//Compile using gcc-5
+					currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+					cfa_build(true)
+
+					//Compile using gcc-4.9
+					currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+					cfa_build(true)
+				}
 
 				//Compile latex documentation