Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
45663122
Commit
45663122
authored
Jan 17, 2008
by
Ken Martin
Browse files
ENH: use CTestTestfile.txt
parent
14fc7dd1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/CTest/cmCTestTestHandler.cxx
View file @
45663122
...
...
@@ -98,14 +98,9 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
// does the CTestTestfile.cmake exist ?
testFilename
=
"CTestTestfile.cmake"
;
}
else
if
(
cmSystemTools
::
FileExists
(
"DartTestfile.txt"
)
)
{
// does the DartTestfile.txt exist ?
testFilename
=
"DartTestfile.txt"
;
}
else
{
// No
Dar
tTestfile
.txt
? Who cares...
// No
CTes
tTestfile? Who cares...
cmSystemTools
::
ChangeDirectory
(
cwd
.
c_str
());
continue
;
}
...
...
@@ -1282,11 +1277,6 @@ void cmCTestTestHandler::GetListOfTests()
// does the CTestTestfile.cmake exist ?
testFilename
=
"CTestTestfile.cmake"
;
}
else
if
(
cmSystemTools
::
FileExists
(
"DartTestfile.txt"
)
)
{
// does the DartTestfile.txt exist ?
testFilename
=
"DartTestfile.txt"
;
}
else
{
return
;
...
...
Source/cmLocalGenerator.cxx
View file @
45663122
...
...
@@ -174,14 +174,8 @@ void cmLocalGenerator::GenerateTestFiles()
}
std
::
string
file
=
this
->
Makefile
->
GetStartOutputDirectory
();
file
+=
"/"
;
if
(
this
->
Makefile
->
IsSet
(
"CTEST_NEW_FORMAT"
)
)
{
file
+=
"CTestTestfile.cmake"
;
}
else
{
file
+=
"DartTestfile.txt"
;
}
file
+=
"CTestTestfile.cmake"
;
cmGeneratedFileStream
fout
(
file
.
c_str
());
fout
.
SetCopyIfDifferent
(
true
);
...
...
@@ -196,10 +190,7 @@ void cmLocalGenerator::GenerateTestFiles()
<<
"# tree CMakeLists.txt file, skipping any SUBDIRS() or "
<<
"ADD_TEST() commands"
<<
std
::
endl
<<
"# that are excluded by CMake control structures, i.e. IF() "
<<
"commands."
<<
std
::
endl
<<
"#"
<<
std
::
endl
<<
"# The next line is critical for Dart to work"
<<
std
::
endl
<<
"# Duh :-)"
<<
std
::
endl
<<
std
::
endl
;
<<
"commands."
<<
std
::
endl
;
const
char
*
testIncludeFile
=
this
->
Makefile
->
GetProperty
(
"TEST_INCLUDE_FILE"
);
...
...
Source/ctest.cxx
View file @
45663122
...
...
@@ -179,7 +179,7 @@ static const char * cmDocumentationOptions[][3] =
{
"--ctest-config"
,
"The configuration file used to initialize CTest state "
"when submitting dashboards."
,
"This option tells CTest to use different initialization file instead of "
"
Dar
tConfiguration.tcl. This way multiple initialization files can be "
"
CTes
tConfiguration.tcl. This way multiple initialization files can be "
"used for example to submit to multiple dashboards."
},
{
"--overwrite"
,
"Overwrite CTest configuration option."
,
"By default ctest uses configuration options from configuration file. "
...
...
@@ -224,8 +224,7 @@ int main (int argc, char *argv[])
// If there is a testing input file, check for documentation options
// only if there are actually arguments. We want running without
// arguments to run tests.
if
(
argc
>
1
||
!
cmSystemTools
::
FileExists
(
"DartTestfile.txt"
)
&&
!
cmSystemTools
::
FileExists
(
"CTestTestfile.cmake"
))
if
(
argc
>
1
||
!
cmSystemTools
::
FileExists
(
"CTestTestfile.cmake"
))
{
if
(
argc
==
1
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment