summaryrefslogtreecommitdiffstats
path: root/Source/cmCTest.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-07 16:21:03 (GMT)
committerBrad King <brad.king@kitware.com>2019-11-07 19:14:28 (GMT)
commited65b3e984ccce9b915a5a71e5a8d13b892b63d8 (patch)
treeb23d0a38d6f4e16384d4acd6d575d621e478b72d /Source/cmCTest.cxx
parent449fceeb1fd9619d9b01f8aed0e9e5784e10dacb (diff)
downloadCMake-ed65b3e984ccce9b915a5a71e5a8d13b892b63d8.zip
CMake-ed65b3e984ccce9b915a5a71e5a8d13b892b63d8.tar.gz
CMake-ed65b3e984ccce9b915a5a71e5a8d13b892b63d8.tar.bz2
CTest: Rename internal APIs for --repeat options
Replace use of the term "rerun" with "repeat" to match the public names.
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r--Source/cmCTest.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 34e9479..a49866c 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -83,8 +83,8 @@ struct cmCTest::Private
std::string Name;
};
- int RepeatTests = 1; // default to run each test once
- cmCTest::Rerun RerunMode = cmCTest::Rerun::Never;
+ int RepeatCount = 1; // default to run each test once
+ cmCTest::Repeat RepeatMode = cmCTest::Repeat::Never;
std::string ConfigType;
std::string ScheduleType;
std::chrono::system_clock::time_point StopTime;
@@ -1845,7 +1845,7 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
errormsg = "'--repeat-until-fail' requires an argument";
return false;
}
- if (this->Impl->RerunMode != cmCTest::Rerun::Never) {
+ if (this->Impl->RepeatMode != cmCTest::Repeat::Never) {
errormsg = "At most one '--repeat-*' option may be used.";
return false;
}
@@ -1856,9 +1856,9 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"'--repeat-until-fail' given non-integer value '" + args[i] + "'";
return false;
}
- this->Impl->RepeatTests = static_cast<int>(repeat);
+ this->Impl->RepeatCount = static_cast<int>(repeat);
if (repeat > 1) {
- this->Impl->RerunMode = cmCTest::Rerun::UntilFail;
+ this->Impl->RepeatMode = cmCTest::Repeat::UntilFail;
}
}
@@ -1867,7 +1867,7 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
errormsg = "'--repeat-until-pass' requires an argument";
return false;
}
- if (this->Impl->RerunMode != cmCTest::Rerun::Never) {
+ if (this->Impl->RepeatMode != cmCTest::Repeat::Never) {
errormsg = "At most one '--repeat-*' option may be used.";
return false;
}
@@ -1878,9 +1878,9 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"'--repeat-until-pass' given non-integer value '" + args[i] + "'";
return false;
}
- this->Impl->RepeatTests = static_cast<int>(repeat);
+ this->Impl->RepeatCount = static_cast<int>(repeat);
if (repeat > 1) {
- this->Impl->RerunMode = cmCTest::Rerun::UntilPass;
+ this->Impl->RepeatMode = cmCTest::Repeat::UntilPass;
}
}
@@ -1889,7 +1889,7 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
errormsg = "'--repeat-after-timeout' requires an argument";
return false;
}
- if (this->Impl->RerunMode != cmCTest::Rerun::Never) {
+ if (this->Impl->RepeatMode != cmCTest::Repeat::Never) {
errormsg = "At most one '--repeat-*' option may be used.";
return false;
}
@@ -1900,9 +1900,9 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"'--repeat-after-timeout' given non-integer value '" + args[i] + "'";
return false;
}
- this->Impl->RepeatTests = static_cast<int>(repeat);
+ this->Impl->RepeatCount = static_cast<int>(repeat);
if (repeat > 1) {
- this->Impl->RerunMode = cmCTest::Rerun::AfterTimeout;
+ this->Impl->RepeatMode = cmCTest::Repeat::AfterTimeout;
}
}
@@ -2896,14 +2896,14 @@ const std::map<std::string, std::string>& cmCTest::GetDefinitions() const
return this->Impl->Definitions;
}
-int cmCTest::GetTestRepeat() const
+int cmCTest::GetRepeatCount() const
{
- return this->Impl->RepeatTests;
+ return this->Impl->RepeatCount;
}
-cmCTest::Rerun cmCTest::GetRerunMode() const
+cmCTest::Repeat cmCTest::GetRepeatMode() const
{
- return this->Impl->RerunMode;
+ return this->Impl->RepeatMode;
}
void cmCTest::SetBuildID(const std::string& id)