1.修复bug

2.发布3.0.8
Scemoon · Feb 2, 2015 · 99ccf69 · 99ccf69
1 parent 8649fa4
commit 99ccf69
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 220 deletions.
diff --git a/USAGE b/USAGE
@@ -17,7 +17,7 @@
              PARALLEL=2,4,8  	        //将测试2、4、8并行
              TIMES = 5                  //测试次数5次
      3.创建测试任务, 如:
-       ./lpts.py --create -t stream -f jobs.xml -p parameters/default.conf -n testname
+       ./lpts.py --create -t stream -f  jobs.xml -p parameters/default.conf -n testname
        参数说明：
         -f 指定jobs.xml,不指定时，程序将自动指定为db/jobs.xml
         -p 测试参数配置文件，不指定时，程序将自动指定为parameters/default.conf
@@ -39,7 +39,7 @@
 ------------------------------------------------------------------------------------------
 
   @@ 运行测试任务
-      ./lpts.py --run -t stream -f db/jobs.xml -i 140212142334 --clean 
+      ./lpts.py --run -t stream -f jobs.xml -i 140212142334 --clean 
       参数说明：
        -f 指定jobs.xml,,不指定时，程序将自动指定为db/jobs.xml
        -i 指定jobs.xml中job id, 默认jobs.xml中最新的job id

diff --git a/Version b/Version
diff --git a/api/tests/unixbench/unixbench.py b/api/tests/unixbench/unixbench.py
@@ -156,7 +156,7 @@ def __match_index(self, file):
         result_lines = lutils.read_all_lines(file)
       #  flag_dic = {}
         for parallel in self.parallels:
-            re_match = "\d+ CPUs in system; running %d parallel cop\S+ of tests" % parallel
+            re_match = "\d+ CPU\S in system; running %d parallel cop\S+ of tests" % parallel
             parallel_result_dic = result_dic.copy()
             for line in result_lines:
                 if re.search(re_match, line, re.I):

diff --git a/change.txt b/change.txt
@@ -72,3 +72,9 @@ parallel，个别测试工具的图例的X轴为测试指标
  4). 修复 执行scripts/clean.sh，会删除lpts根目录的bug
  5). 修复xls 对比report, OSinfo sheet,多组格式紊乱问题
  6). 修复图标Y轴模糊的问题
+
+ @2015/02/02
+ 1)修复单核cpu，unixbench运行Error的bug
+ 2)更新部分描述性语句错误
+ 3)发部2015春节前最后一个版本
+
diff --git a/lib/lptlog.py b/lib/lptlog.py
@@ -93,7 +93,7 @@ class LogRecord:
     '''
 
 
-    logname = 'LPT'
+    logname = 'lpts'
     fmt = 'simple'
     level = logging.INFO
     file_level = logging.DEBUG

diff --git a/lib/lptreport.py b/lib/lptreport.py
@@ -16,6 +16,10 @@
 from signal import SIGTERM 
 from lpt.lib import sysinfo
 from lpt.lib import lmbench
+try:
+    from PIL import Image
+except  Exception:
+    lptlog.warning("缺少PIL模块，可能导致生成图片Error!")
 
 
 lptdir = os.getenv("LPTROOT")
@@ -911,7 +915,6 @@ def report(self):
                 self.sheet.col(col).width = 16000/colwidth
 
         if self.chart and len(self.get_parallels())>1:
-            from PIL import Image
             lptlog.info("生成图片报告")
             self.gen_index_graphic()
             self.write_indexs_img(row, 1)
@@ -1411,7 +1414,6 @@ def compare_tool_xls(tool, tool_sheet, xls_object, xmls_dict, writeType="paralle
                 for col in range(2, colwidth+1):
                     tool_cmp_object._set_col_width(col, 16000/colwidth)
             if chart:
-                from PIL import Image
                 row = tool_cmp_object.write_par_img(parallel, "cmp", row ,2)
 
     elif writeType=="index":
@@ -1429,7 +1431,6 @@ def compare_tool_xls(tool, tool_sheet, xls_object, xmls_dict, writeType="paralle
                 tool_cmp_object._set_col_width(2, 16000)
 
             if chart:
-                from PIL import Image
                 row = tool_cmp_object.write_index_img(index, "cmp", row, 2)
 
     #调整表格宽度

diff --git a/lpts.py b/lpts.py
@@ -403,7 +403,8 @@ def parser_opts(self, argv=sys.argv):
                     if not os.path.isfile(self.jobs_xml):
                         #lptlog.warning("缺失jobs文件，请核对jobs文件或者重新创建job")
                         #raise NameError("")
-                        raise ValueError, "缺失jobs文件，请核对jobs文件或者重新创建job"
+                        #raise ValueError, "缺失jobs文件，请核对jobs文件或者重新创建job"
+                        pass
                     else:
                         self.list_jobs(self.jobs_xml)
                 #else:
@@ -420,7 +421,7 @@ def parser_opts(self, argv=sys.argv):
             sys.exit()
         except Exception, e:
             lptlog.exception('')
-            lptlog.debug(e)
+            #lptlog.debug(e)
 
 def main(argv=sys.argv):
    lpt= Lpt()

diff --git a/parameters/default.conf b/parameters/default.conf
@@ -34,13 +34,13 @@ TIMES = 18
 #定义stream两种测试模式，default,custom
 #@default,默认执行单并行测试
 #@custom,指定并行数测试
-TESTMODE = default
+TESTMODE = custom
 
 #custom模式下，指定并行数,example:1,2,4,6,8,16,默认为1
-PARALLEL = 1
+PARALLEL = 1,5
 
 #测试次数
-TIMES = 5
+TIMES = 10
 
 #*************************************************************************	
 [iozone]

diff --git a/parameters/test.conf b/parameters/test.conf
diff --git a/release b/release
@@ -1 +1 @@
-LPT3.0
+Linux Performance Test Suite 3.0
diff --git a/version b/version
@@ -0,0 +1 @@
+v3.0.8