Changes in / [ef7219c:7a2c5391]

Files:

• Jenkins/FullBuild (modified) (2 diffs)
• src/tests/test.py (modified) (1 diff)

Jenkins/FullBuild

@@ -32 +32 @@
                 checkout scm
 
-                collect_git_info()
-
                 //parse git logs to find what changed
                 sh "git remote > ${out_dir}/GIT_REMOTE"
@@ -44 +42 @@
 
                 sh "git push DoLang ${gitRefNewValue}:master"
-}
-
-//Helper routine to collect information about the git history
-def collect_git_info() {
-
-        //create the temporary output directory in case it doesn't already exist
-        def out_dir = pwd tmp: true
-        sh "mkdir -p ${out_dir}"
-
-        //parse git logs to find what changed
-        gitRefName = env.BRANCH_NAME
-        dir("../${gitRefName}@script") {
-                sh "git reflog > ${out_dir}/GIT_COMMIT"
-        }
-        git_reflog = readFile("${out_dir}/GIT_COMMIT")
-        gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
-        gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
 }
 

src/tests/test.py

@@ -23 +23 @@
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
-        sh('echo "int main() { return 0; }" > .dummy.c')
-        sh("make .dummy", print2stdout=False)
-        _, out = sh("file .dummy", print2stdout=False)
-        sh("rm -f .dummy.c > /dev/null 2>&1")
-        sh("rm -f .dummy > /dev/null 2>&1")
-        return re.search("ELF\s([0-9]+)-bit", out).group(1)
+        with open('Makefile') as file:
+                makefile = file.read()
+                m = re.search("CFA_FLAGS\s*=\s*-m(.*)", makefile)
+                return m.group(1) if m else '64'
 
 # reads the directory ./.expect and indentifies the tests
 def listTests():
         machineType = getMachineType()
-
-        print(machineType)
 
         # tests directly in the .expect folder will always be processed