diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2017-09-06 16:07:08 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-09-08 14:03:01 (GMT) |
commit | 5b829c89b8cdb5b8f908dcd4849a37a183b0971c (patch) | |
tree | 4c0105ce057c91a42a77adac5450408a153d654b /Tests/RunCMake/ctest_labels_for_subprojects | |
parent | a6e32eb0c26277c71c586aba457df5daaf2a71ba (diff) | |
download | CMake-5b829c89b8cdb5b8f908dcd4849a37a183b0971c.zip CMake-5b829c89b8cdb5b8f908dcd4849a37a183b0971c.tar.gz CMake-5b829c89b8cdb5b8f908dcd4849a37a183b0971c.tar.bz2 |
CTest: Weight reported test times by PROCESSORS in summaries
This commit changes the times reported by labels and subprojects to be
weighted by the PROCESSORS property. It is reported with `sec*proc`
instead of just `sec`.
Diffstat (limited to 'Tests/RunCMake/ctest_labels_for_subprojects')
7 files changed, 13 insertions, 13 deletions
diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt index e3be144..05b484d 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfigCTestScript-stdout.txt @@ -1,10 +1,10 @@ 17% tests passed, 5 tests failed out of 6 + Subproject Time Summary: -MyExperimentalFeature += +[0-9.]+ sec \(5 tests\) -MyProductionCode += +[0-9.]+ sec \(1 test\) +MyExperimentalFeature += +[0-9.]+ sec\*proc \(5 tests\) +MyProductionCode += +[0-9.]+ sec\*proc \(1 test\) + Label Time Summary: -NotASubproject += +[0-9.]+ sec \(6 tests\) +NotASubproject += +[0-9.]+ sec\*proc \(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 e3be144..05b484d 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariable-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariable-stdout.txt @@ -1,10 +1,10 @@ 17% tests passed, 5 tests failed out of 6 + Subproject Time Summary: -MyExperimentalFeature += +[0-9.]+ sec \(5 tests\) -MyProductionCode += +[0-9.]+ sec \(1 test\) +MyExperimentalFeature += +[0-9.]+ sec\*proc \(5 tests\) +MyProductionCode += +[0-9.]+ sec\*proc \(1 test\) + Label Time Summary: -NotASubproject += +[0-9.]+ sec \(6 tests\) +NotASubproject += +[0-9.]+ sec\*proc \(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 20c6c86..c2c1bc7 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stdout.txt @@ -1,9 +1,9 @@ 0% tests passed, 1 tests failed out of 1 + Subproject Time Summary: -MyThirdPartyDependency += +[0-9.]+ sec \(1 test\) +MyThirdPartyDependency += +[0-9.]+ sec\*proc \(1 test\) + Label Time Summary: -NotASubproject += +[0-9.]+ sec \(1 test\) +NotASubproject += +[0-9.]+ sec\*proc \(1 test\) + Total Test time \(real\) = +[0-9.]+ sec diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCMakeLists-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCMakeLists-stdout.txt index b5d76a9..3567a92 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCMakeLists-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCMakeLists-stdout.txt @@ -1,6 +1,6 @@ 50% tests passed, 1 tests failed out of 2 + Subproject Time Summary: -MySubproject += +[0-9.]+ sec \(2 tests\) +MySubproject += +[0-9.]+ sec\*proc \(2 tests\) + 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 bec6b14..3a71022 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfig-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfig-stdout.txt @@ -1,9 +1,9 @@ 67% tests passed, 1 tests failed out of 3 + Subproject Time Summary: -MySubproject += +[0-9.]+ sec \(2 tests\) +MySubproject += +[0-9.]+ sec\*proc \(2 tests\) + Label Time Summary: -NotASubproject += +[0-9.]+ sec \(1 test\) +NotASubproject += +[0-9.]+ sec\*proc \(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 1ac5530..1146bfe 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfigNoSummary-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCTestConfigNoSummary-stdout.txt @@ -1,6 +1,6 @@ 67% tests passed, 1 tests failed out of 3 + Label Time Summary: -NotASubproject += +[0-9.]+ sec \(1 test\) +NotASubproject += +[0-9.]+ sec\*proc \(1 test\) + Total Test time \(real\) = +[0-9.]+ sec diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCommandLine-stdout.txt b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCommandLine-stdout.txt index b5d76a9..3567a92 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCommandLine-stdout.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/ModuleVariableCommandLine-stdout.txt @@ -1,6 +1,6 @@ 50% tests passed, 1 tests failed out of 2 + Subproject Time Summary: -MySubproject += +[0-9.]+ sec \(2 tests\) +MySubproject += +[0-9.]+ sec\*proc \(2 tests\) + Total Test time \(real\) = +[0-9.]+ sec |