diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2017-09-06 16:03:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-08 14:02:39 (GMT) |
| commit | a6e32eb0c26277c71c586aba457df5daaf2a71ba (patch) | |
| tree | 8bc7b58fc6ae9598bfdf4c5edcbb3589062b52de /Tests | |
| parent | d4f58a9cd8e3709a0cb176814226da324b17e0fe (diff) | |
| download | CMake-a6e32eb0c26277c71c586aba457df5daaf2a71ba.zip CMake-a6e32eb0c26277c71c586aba457df5daaf2a71ba.tar.gz CMake-a6e32eb0c26277c71c586aba457df5daaf2a71ba.tar.bz2 | |
CTest: Split out labels and subproject labels in summary output
This commit splits out the reporting of labels and labels used for sub
projects. If a label is a sub project label it will not be included in
the label summary. To implement this the commit creates
PrintLabelOrSubprojectSummary which is able to do the work of both
PrintLabelSummary and PrintSubprojectSummary avoiding code duplication.
Diffstat (limited to 'Tests')
5 files changed, 12 insertions, 1 deletions
diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt index ae00e51..e3be144 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt @@ -4,4 +4,7 @@ Subproject Time Summary: MyExperimentalFeature += +[0-9.]+ sec \(5 tests\) MyProductionCode += +[0-9.]+ sec \(1 test\) + +Label Time Summary: +NotASubproject += +[0-9.]+ sec \(6 tests\) ++ Total Test time \(real\) = +[0-9.]+ sec diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariable-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariable-stdout.txt index ae00e51..e3be144 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariable-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariable-stdout.txt @@ -4,4 +4,7 @@ Subproject Time Summary: MyExperimentalFeature += +[0-9.]+ sec \(5 tests\) MyProductionCode += +[0-9.]+ sec \(1 test\) + +Label Time Summary: +NotASubproject += +[0-9.]+ sec \(6 tests\) ++ Total Test time \(real\) = +[0-9.]+ sec diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stdout.txt index a78a99a..20c6c86 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stdout.txt @@ -3,4 +3,7 @@ Subproject Time Summary: MyThirdPartyDependency += +[0-9.]+ sec \(1 test\) + +Label Time Summary: +NotASubproject += +[0-9.]+ sec \(1 test\) ++ Total Test time \(real\) = +[0-9.]+ sec diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfig-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfig-stdout.txt index 01851fd..bec6b14 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfig-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfig-stdout.txt @@ -3,4 +3,7 @@ Subproject Time Summary: MySubproject += +[0-9.]+ sec \(2 tests\) + +Label Time Summary: +NotASubproject += +[0-9.]+ sec \(1 test\) ++ Total Test time \(real\) = +[0-9.]+ sec diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfigNoSummary-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfigNoSummary-stdout.txt index 0209bfe..1ac5530 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfigNoSummary-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfigNoSummary-stdout.txt @@ -1,7 +1,6 @@ 67% tests passed, 1 tests failed out of 3 + Label Time Summary: -MySubproject += +[0-9.]+ sec \(2 tests\) NotASubproject += +[0-9.]+ sec \(1 test\) + Total Test time \(real\) = +[0-9.]+ sec |