bake-toolkit 2.37.10 → 2.37.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41533efcf74917cf145922efbf597c510485ba76
-  data.tar.gz: 6505bada10e3389a7ffa4e5d90604486a257ab71
+  metadata.gz: b9c08bcd9a6877108b9c2f91805c50271cf900c6
+  data.tar.gz: cf18a35e22de426069d6f05b346234eb2d6b464a
 SHA512:
-  metadata.gz: 23c1b3a301acc734e2795091c7dc3627f2b6685c8ff535b20fc71cd55f604d119b3e6f0b75187c2af6cbe8aca5b7c350731d12496381c4788dbc1c7dc786b91c
-  data.tar.gz: abae3a5e45e813d41f2987816f196629421b7f4e982a2a4f8f2fa63db267f6b8bac0441850edce52fc14d0fbc9634172d4eff0a6fac240f5adf7002676adb4b6
+  metadata.gz: 393444e52b8e9e5183eb0512c95eb5efa758ed14926d30090fe5835aa2f8c0a344bbda47e92eed0680396edefc40037ae8fa658ae14dd233a346b13ace8982cf
+  data.tar.gz: 6e07994cfbe5e233b4e0527d31a6851d7346427656f866646bd20e1f76c05eddad6a4b998ad5ce74ab98097c1874042069391681a530970d9a4ce35d7614b943

data/bin/bakeqac

@@ -46,9 +46,13 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
 
   loop do
     FileUtils.rm_rf @options.qacdata if adminStepAndImmediateOutput
+    FileUtils::mkdir_p @options.qacdata
+
+    cmdDupped = cmd.dup
+    cmdDupped << @options.qacdata
 
     # admin step should not take longer than 60 seconds, rest not longer than 80% of qacretry time if specified
-    success, consoleOutput = ProcessHelper.run(cmd, adminStepAndImmediateOutput, true, nil, [0], Dir.pwd, adminStepAndImmediateOutput ? 60 : (@options.qacretry * 0.8).to_i)
+    success, consoleOutput = ProcessHelper.run(cmdDupped, adminStepAndImmediateOutput, true, nil, [0], Dir.pwd, adminStepAndImmediateOutput ? 60 : (@options.qacretry * 0.8).to_i)
     licenseError = false
     qacDaemonError = false
     processTimeout = false
@@ -66,24 +70,29 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
       end
       if (line.include?("Process timeout") || line.include?("A mutually exclusive operation is in progress"))
         puts line
-        puts "Seconds left after killing process: %d" % (@options.qacretry - (Time.now - timeStart))
         processTimeout = true
-        puts "bakeqac: Removing locks from #{@options.qacdata}..."
-        sleep(1)
-        successRemove, consoleOutput = ProcessHelper.run($cmdRemoveLocks, false)
-        puts "Seconds left after removing locks: %d" % (@options.qacretry - (Time.now - timeStart))
-        puts consoleOutput unless consoleOutput.empty?
+        if !adminStepAndImmediateOutput
+          puts "bakeqac: Removing locks from #{@options.qacdata}..."
+          sleep(1)
+          successRemove, consoleOutput = ProcessHelper.run($cmdRemoveLocks, false)
+          puts consoleOutput unless consoleOutput.empty?
+        end
         break
       end
     end
     cSizeCheck = checkCipSize()
 
     break unless ((@options.qacretry >= (Time.now - timeStart)) && (!cSizeCheck || licenseError || qacDaemonError || processTimeout))
-    puts "Retry seconds left: %d" % (@options.qacretry - (Time.now - timeStart))
+    puts "bakeqac: Retry seconds left: %d" % (@options.qacretry - (Time.now - timeStart))
+
+    if processTimeout && adminStepAndImmediateOutput
+      @options.incrementQacdata
+    end
+
   end
   checkError = !cSizeCheck || licenseError || qacDaemonError || processTimeout
   if @options.qacretry > 0 && checkError
-    puts "Retry timeout over: %d -> failure." % (@options.qacretry - (Time.now - timeStart))
+    puts "bakeqac: Retry timeout over: %d -> failure." % (@options.qacretry - (Time.now - timeStart))
   end
   success = false if checkError
   return [success, consoleOutput, checkError]
@@ -145,10 +154,11 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 
   if (@options.qacstep.nil? or @options.qacstep.include?"admin")
 
-    cmd = qaExe + ["admin", "--qaf-project-config", "--qaf-project", @options.qacdata]
+    cmd = qaExe + ["admin", "--qaf-project-config"]
     @options.cct.each {|c| cmd << "--cct" << c }
     cmd << "--rcf" << @options.rcf
     cmd << "--acf" << @options.acf
+    cmd << "--qaf-project" # <<  @options.qacdata
 
     puts "bakeqac: creating database..."
 
@@ -185,7 +195,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
   if success and (@options.qacstep.nil? or @options.qacstep.include?"analyze")
     FileUtils::mkdir_p @options.qacdata
 
-    cmd = qaExe + ["analyze", "-P", @options.qacdata, "-b"]
+    cmd = qaExe + ["analyze", "-b"]
 
     begin
       devMode = File.exist?"c:/Projekte/git/bake/bin/bake"
@@ -201,7 +211,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 
     bcmd += passedParams.join(" ")
     cmd << bcmd
-
+    cmd << "-P" # << @options.qacdata
     puts "bakeqac: building and analyzing files..."
 
     success, consoleOutput, checkError = executeQacli(cmd)
@@ -245,11 +255,12 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 
     puts "bakeqac: printing results..."
 
-    cmd = qaExe + ["view", "-P", @options.qacdata, "-m", "STDOUT"]
+    cmd = qaExe + ["view", "-m", "STDOUT"]
     if not @options.qacnoformat
       cmd += ["-f", "%?u==0%(MSG: %:trc: %)%F(%l,%c): (%r:%N)%t%?v%(\n%v%)"]
     end
 
+    cmd << "-P" # << @options.qacdata,
     success, consoleOutput, checkError = executeQacli(cmd)
 
     if ProjectFilter.is_valid?
@@ -403,8 +414,9 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 
     puts "bakeqac: generating MDR report..."
 
-    cmd = qaExe + ["report", "-P", @options.qacdata, "-t", "MDR"]
+    cmd = qaExe + ["report", "-t", "MDR"]
 
+    cmd << "-P" # << @options.qacdata
     success, consoleOutput, checkError = executeQacli(cmd)
     puts consoleOutput
 
@@ -421,7 +433,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
         data = JSON.parse(raw)
 
         filename = File.normalize(data["file"])
-        filename = @options.qacdata + "/../" + filename unless File.is_absolute?(filename) # only needed for UT
+        filename = @options.qacdata + "/../../" + filename unless File.is_absolute?(filename) # only needed for UT
         fileContent = nil
         fileFunctions = []
 

data/lib/bakeqac/filter.rb

@@ -6,7 +6,6 @@ module Bake
       @@filterList = nil
       @@valid = nil
       @@options = options
-      @@filter_filename = "#{@@options.qacdata}/filter.txt"
     end
 
     def self.projects
@@ -25,7 +24,8 @@ module Bake
     end
 
     def self.writeFilter(filter)
-      File.open(@@filter_filename, "w+") do |f|
+      filter_filename = "#{@@options.qacdata}/filter.txt"
+      File.open(filter_filename, "w+") do |f|
         filter.uniq!
         filter.delete_if { |f| (f.end_with? "/gtest") or (f.end_with? "/gmock") }
         f.puts(filter)
@@ -34,9 +34,10 @@ module Bake
 
     def self.calcFilter_internal
       @@filterList = []
-      @@valid = File.exist?(@@filter_filename) && @@options.qacfilter
+      filter_filename = "#{@@options.qacdata}/filter.txt"
+      @@valid = File.exist?(filter_filename) && @@options.qacfilter
       if @@valid
-        File.open(@@filter_filename, "r") do |f|
+        File.open(filter_filename, "r") do |f|
           f.each_line { |line| @@filterList << line.strip }
         end
       end

data/lib/bakeqac/options/options.rb

@@ -6,10 +6,11 @@ require 'common/options/finder'
 module Bake
 
   class BakeqacOptions < Parser
-    attr_reader :rcf, :acf, :qacdata, :qacstep, :qac_home, :cct_append  # String
+    attr_reader :rcf, :acf, :qacstep, :qac_home, :cct_append  # String
     attr_reader :c11, :c14, :qacfilter, :qacnoformat, :qacunittest, :qacdoc, :cct_patch # Boolean
     attr_reader :cct # Array
     attr_reader :qacretry # int
+    attr_accessor :qacdata # String
 
     def initialize(argv)
       super(argv)
@@ -30,6 +31,8 @@ module Bake
       @qacunittest = false
       @qacretry = 0
       @qacdoc = false
+      @qacdataOrg = nil
+      @qacdataCounter = 0
 
       add_option(["-b", ""                         ], lambda { |x| setDefault(x)                })
       add_option(["-a"                             ], lambda { |x| Bake.formatter.setColorScheme(x.to_sym) })
@@ -108,6 +111,14 @@ module Bake
       return nil
     end
 
+    def incrementQacdata()
+      if @qacdataCounter > 0
+        FileUtils::rm_rf(@qacdata)
+      end
+      @qacdataCounter = @qacdataCounter + 1
+      @qacdata = @qacdataOrg + "/run" + @qacdataCounter.to_s
+    end
+
     def parse_options(bakeOptions)
       parse_internal(true, bakeOptions)
 
@@ -121,6 +132,9 @@ module Bake
       end
 
       @qacdata = "#{@main_dir}/.qacdata" if @qacdata.nil?
+      @qacdataOrg = @qacdata
+      @qacdataCounter = 0
+      incrementQacdata()
 
       if !ENV["QAC_HOME"] || ENV["QAC_HOME"].empty?
         Bake.formatter.printError("Error: specify the environment variable QAC_HOME.")

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.37.10"
+      "2.37.11"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.37.10
+  version: 2.37.11
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext