增加测试用例；美化时间报告格式

Author: duyanning

src/GccCpp2ObjAction.cpp

@@ -73,10 +73,7 @@ bool GccCpp2ObjAction::execute(const DepInfo& info)
     obj->generate_birth_cert(dep_path);
     //obj->generate_birth_cert();
 
-    MINILOG(build_exe_timer_logger, "compiling " << cpp_path.filename()
-        << " "
-        << timer.format(boost::timer::default_places, "%ws"));
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " compiling " << cpp_path.filename());
 
     return true;
-
 }

src/GccObj2ExeAction.cpp

@@ -69,9 +69,7 @@ bool GccObj2ExeAction::execute(const DepInfo& info)
 
     exe->generate_birth_cert();
 
-    MINILOG(build_exe_timer_logger, "linking " << exe_path.filename()
-        << " "
-        << timer.format(boost::timer::default_places, "%ws"));
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " linking " << exe_path.filename());
 
     return true;
 }

src/VcCpp2ObjAction.cpp

@@ -175,9 +175,7 @@ bool VcCpp2ObjAction::execute(const DepInfo& info)
     obj->generate_birth_cert(dep_path);
     //obj->generate_birth_cert();
 
-    MINILOG(build_exe_timer_logger, "compiling " << cpp_path.filename()
-        << " "
-        << timer.format(boost::timer::default_places, "%ws"));
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " compiling " << cpp_path.filename());
 
     return true;
 

src/VcObj2ExeAction.cpp

@@ -78,9 +78,7 @@ bool VcObj2ExeAction::execute(const DepInfo& info)
 
     exe->generate_birth_cert();
 
-    MINILOG(build_exe_timer_logger, "linking " << exe_path.filename()
-        << " "
-        << timer.format(boost::timer::default_places, "%ws"));
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " linking " << exe_path.filename());
 
     return true;
 }

src/main.cpp

@@ -9,16 +9,20 @@ try {
     // 解析命令行选项，读取配置文件
     parse(argc, argv);
 
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " PARSE ");
+
     // 扫描源文件，搜集信息
     collect();
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " COLLECT");
     if (collect_only) return 0;
 
     // 构建
     bool success = build();
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " BUILD");
     if (!success) return 0;
     if (build_only) return 0;
 
-    MINILOG(build_exe_timer_logger, "total " << timer.format(boost::timer::default_places, "%ws"));
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " TOTAL = PARSE + COLLECT + BUILD");
 
     // 运行
     run();

src/scan.cpp

@@ -220,9 +220,7 @@ void collect_source(fs::path src_path)
     // 将采集到的部分信息合并到整体中
     merge(pack);
 
-    MINILOG(build_exe_timer_logger, "collecting " << src_path.filename() 
-        << " "
-        << timer.format(boost::timer::default_places, "%ws"));
+    MINILOG(build_exe_timer_logger, timer.format(boost::timer::default_places, "%ws") << " collecting " << src_path.filename());
 
     // 采集引用的.cpp文件
     for (auto a : pack.referenced_sources) {

test/incremental-scan/run-mingw.bat

@@ -0,0 +1,27 @@
+@ECHO OFF 
+
+DEL one.* > NUL
+copy backup\void-one.cpp .\one.cpp
+copy backup\void-one.h .\one.h
+DEL three.* > NUL
+copy backup\void-three.cpp .\three.cpp
+copy backup\void-three.h .\three.h
+
+cpps --clear -c mingw -v main.cpp
+REM CHECK: scanning main.cpp
+REM CHECK-NEXT: scanning one.cpp
+REM CHECK-NEXT: scanning two.cpp
+REM CHECK-NEXT: scanning three.cpp
+REM CHECK-NEXT: scanning four.cpp
+REM CHECK-NEXT: scanning five.cpp
+
+del one.* > NUL
+copy backup\int-one.cpp .\one.cpp
+copy backup\int-one.h .\one.h
+del three.* > NUL
+copy backup\int-three.cpp .\three.cpp
+copy backup\int-three.h .\three.h
+
+cpps -c mingw -v main.cpp
+REM CHECK: scanning one.cpp
+REM CHECK-NEXT: scanning three.cpp

test/incremental-scan/run-vc.bat

@@ -0,0 +1,27 @@
+@ECHO OFF 
+
+DEL one.* > NUL
+copy backup\void-one.cpp .\one.cpp
+copy backup\void-one.h .\one.h
+DEL three.* > NUL
+copy backup\void-three.cpp .\three.cpp
+copy backup\void-three.h .\three.h
+
+cpps --clear -c vc -v main.cpp
+REM CHECK: scanning main.cpp
+REM CHECK-NEXT: scanning one.cpp
+REM CHECK-NEXT: scanning two.cpp
+REM CHECK-NEXT: scanning three.cpp
+REM CHECK-NEXT: scanning four.cpp
+REM CHECK-NEXT: scanning five.cpp
+
+del one.* > NUL
+copy backup\int-one.cpp .\one.cpp
+copy backup\int-one.h .\one.h
+del three.* > NUL
+copy backup\int-three.cpp .\three.cpp
+copy backup\int-three.h .\three.h
+
+cpps -c vc -v main.cpp
+REM CHECK: scanning one.cpp
+REM CHECK-NEXT: scanning three.cpp