Changes in / [b0ab7853:08065aa4]

Files:

• Jenkinsfile (modified) (9 diffs)
• tests/pybin/tools.py (modified) (2 diffs)
• tests/test.py (modified) (2 diffs)

Jenkinsfile

@@ -2 +2 @@
 
 import groovy.transform.Field
-
-// For skipping stages
-import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 //===========================================================================================================
@@ -85 +82 @@
 //===========================================================================================================
 def clean() {
-        build_stage('Cleanup', true) {
+        build_stage('Cleanup') {
                 // clean the build by wipping the build directory
                 dir(BuildDir) {
@@ -95 +92 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        build_stage('Checkout', true) {
+        build_stage('Checkout') {
                 //checkout the source code and clean the repo
                 final scmVars = checkout scm
@@ -106 +103 @@
 
 def build() {
-        build_stage('Build', true) {
+        build_stage('Build') {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -128 +125 @@
 
 def test() {
-        build_stage('Test: short', !Settings.RunAllTests) {
+        build_stage('Test') {
+
                 dir (BuildDir) {
                         //Run the tests from the tests directory
-                        sh 'make --no-print-directory -C tests'
-                }
-        }
-
-        build_stage('Test: full', Settings.RunAllTests) {
-                dir (BuildDir) {
-                        //Run the tests from the tests directory
-                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes'
-                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no '
+                        if ( Settings.RunAllTests ) {
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=yes'
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=no '
+                        }
+                        else {
+                                sh 'make --no-print-directory -C tests'
+                        }
                 }
         }
@@ -145 +141 @@
 
 def benchmark() {
-        build_stage('Benchmark', Settings.RunBenchmark) {
+        build_stage('Benchmark') {
+
+                if( !Settings.RunBenchmark ) return
+
                 dir (BuildDir) {
                         //Append bench results
@@ -154 +153 @@
 
 def build_doc() {
-        build_stage('Documentation', Settings.BuildDocumentation) {
+        build_stage('Documentation') {
+
+                if( !Settings.BuildDocumentation ) return
+
                 dir ('doc/user') {
                         make_doc()
@@ -166 +168 @@
 
 def publish() {
-        build_stage('Publish', true) {
+        build_stage('Publish') {
 
                 if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
@@ -410 +412 @@
 }
 
-def build_stage(String name, boolean run, Closure block ) {
+def build_stage(String name, Closure block ) {
         StageName = name
         echo " -------- ${StageName} -------- "
-        if(run) {
-                stage(name, block)
-        } else {
-                stage(name) { Utils.markStageSkippedForConditional(STAGE_NAME) }
-        }
+        stage(name, block)
 }
 

tests/pybin/tools.py

@@ -179 +179 @@
                         os.chdir(cwd)
 
-def killgroup():
-        try:
-                os.killpg(os.getpgrp(), signal.SIGINT)
-        except KeyboardInterrupt:
-                pass # expected
-        except Exception as exc:
-                print("Unexpected exception", file=sys.stderr)
-                print(exc, file=sys.stderr)
-                sys.stderr.flush()
-                sys.exit(2)
-
 ################################################################################
 #               file handling
@@ -312 +301 @@
         self.end = time.time()
         self.duration = self.end - self.start
-
-def timed(src, timeout):
-        expire = time.time() + timeout
-        i = iter(src)
-        while True:
-                yield i.next(max(expire - time.time(), 0))

tests/test.py

@@ -202 +202 @@
                 if error :
                         text = text + '\n' + error
-
-                return retcode == TestResult.SUCCESS, text
+                        out = sys.stderr
+
+                print(text, file = out)
+                sys.stdout.flush()
+                sys.stderr.flush()
+
+                return retcode != TestResult.SUCCESS
         except KeyboardInterrupt:
-                return False, ""
-        except:
-                print("Unexpected error in worker thread", file=sys.stderr)
-                sys.stderr.flush()
-                return False, ""
-
+                False
 
 # run the given list of tests with the given parameters
@@ -220 +220 @@
         pool = multiprocessing.Pool(jobs)
 
-        failed = False
-
         # for each test to run
         try :
-                num = len(tests)
-                fancy = sys.stdout.isatty()
-                results = pool.imap_unordered(
+                results = pool.map_async(
                         run_test_worker,
                         tests,
                         chunksize = 1
-                )
-
-                for i, (succ, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
-                        if not succ :
-                                failed = True
-
-                        print("       " + txt)
-
-                        if(fancy and i != num):
-                                print("%d/%d" % (i, num), end='\r')
-                                sys.stdout.flush()
-
+                ).get(settings.timeout.total)
         except KeyboardInterrupt:
-                print("Tests interrupted by user", file=sys.stderr)
                 pool.terminate()
-                pool.join()
-                failed = True
-        except multiprocessing.TimeoutError:
-                print("ERROR: Test suite timed out", file=sys.stderr)
-                pool.terminate()
-                pool.join()
-                failed = True
-                killgroup() # needed to cleanly kill all children
-
+                print("Tests interrupted by user")
+                sys.exit(1)
 
         # clean the workspace
         make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
-        return 1 if failed else 0
+        for failed in results:
+                if failed :
+                        return 1
+
+        return 0