Changeset 8b52686

Timestamp:

Jun 22, 2016, 4:35:42 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e7aed49

Parents:

10dc7491 (diff), b015035 (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 plg2:software/cfa/cfa-cc

Files:

• Jenkinsfile (modified) (2 diffs)
• src/tests/Makefile.am (modified) (1 diff)
• src/tests/Makefile.in (modified) (1 diff)
• src/tests/runTests.sh (deleted)
• src/tests/test.py (modified) (3 diffs)

Jenkinsfile

@@ -33 +33 @@
                 dir ('src/tests') {
                         if (full_build) {
-                                sh 'python test.py --all'
+                                sh 'make all-tests'
                         }
                         else {
-                                sh './runTests.sh'
+                                sh 'make'
                         }
                 }
@@ -188 +188 @@
                                 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

src/tests/Makefile.am

@@ -27 +27 @@
 
 all-local :
+        python test.py vector_test avl_test Operators NumericConstants Expression Enum AsmName Array Typeof Cast
+
+all-tests :
         python test.py --all
 

src/tests/Makefile.in

@@ -634 +634 @@
 
 all-local :
+        python test.py vector_test avl_test Operators NumericConstants Expression Enum AsmName Array Typeof Cast
+
+all-tests :
         python test.py --all
 

src/tests/test.py

@@ -2 +2 @@
 from __future__ import print_function
 
-from os import listdir
+from os import listdir, environ
 from os.path import isfile, join, splitext
 from subprocess import Popen, PIPE, STDOUT
 
 import argparse
+import os
+import re
 import sys
 
@@ -27 +29 @@
                 proc.communicate()
                 return proc.returncode
+
+def file_replace(fname, pat, s_after):
+    # first, see if the pattern is even in the file.
+    with open(fname) as f:
+        if not any(re.search(pat, line) for line in f):
+            return # pattern does not occur in file so we are done.
+
+    # pattern is in the file, so perform replace operation.
+    with open(fname) as f:
+        out_fname = fname + ".tmp"
+        out = open(out_fname, "w")
+        for line in f:
+            out.write(re.sub(pat, s_after, line))
+        out.close()
+        os.rename(out_fname, fname)
+
+def fix_MakeLevel(file) :
+        if environ.get('MAKELEVEL') :
+                file_replace(file, "make\[%i\]" % int(environ.get('MAKELEVEL')), 'make' )
+
 
 ################################################################################
@@ -49 +71 @@
 
         retcode = 0
+
+        fix_MakeLevel(out_file)
+
         if not generate :
                 # diff the output of the files