kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

complex: Move cmSystemTools::UpperCase test to CMakeLibTests 

This test belongs in the CMakeLibTests test driver executable which
correctly links to CMakeLib.
This commit is contained in:
Brad King 2011-12-23 15:41:38 -05:00
parent 49d6dd67f1
commit 569cee1d9e
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/CMakeLib/CMakeLists.txt
View File

@ -6,6 +6,7 @@ include_directories(
set(CMakeLib_TESTS set(CMakeLib_TESTS
testGeneratedFileStream testGeneratedFileStream
testSystemTools
testUTF8 testUTF8
testXMLParser testXMLParser
testXMLSafe testXMLSafe

33
Tests/CMakeLib/testSystemTools.cxx Normal file
View File

@ -0,0 +1,33 @@
/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include "cmSystemTools.h"
#define cmPassed(m) std::cout << "Passed: " << m << "\n"
#define cmFailed(m) std::cout << "FAILED: " << m << "\n"; failed=1
int testSystemTools(int, char*[])
{
int failed = 0;
// ----------------------------------------------------------------------
// Test cmSystemTools::UpperCase
std::string str = "abc";
std::string strupper = "ABC";
if(cmSystemTools::UpperCase(str) == strupper)
{
cmPassed("cmSystemTools::UpperCase is working");
}
else
{
cmFailed("cmSystemTools::UpperCase is working");
}
return failed;
}

14
Tests/Complex/Executable/complex.cxx
View File

@ -149,20 +149,6 @@ extern "C" int NameConflictTest2();
int main() int main()
{ {
#ifdef COMPLEX_TEST_CMAKELIB
// ----------------------------------------------------------------------
// Test cmSystemTools::UpperCase
std::string str = "abc";
std::string strupper = "ABC";
if(cmSystemTools::UpperCase(str) == strupper)
{
cmPassed("cmSystemTools::UpperCase is working");
}
else
{
cmFailed("cmSystemTools::UpperCase is working");
}
#endif
#if 0 #if 0
if(NameConflictTest1() == 0 && NameConflictTest2() == 0) if(NameConflictTest1() == 0 && NameConflictTest2() == 0)
{ {

14
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@ -149,20 +149,6 @@ extern "C" int NameConflictTest2();
int main() int main()
{ {
#ifdef COMPLEX_TEST_CMAKELIB
// ----------------------------------------------------------------------
// Test cmSystemTools::UpperCase
std::string str = "abc";
std::string strupper = "ABC";
if(cmSystemTools::UpperCase(str) == strupper)
{
cmPassed("cmSystemTools::UpperCase is working");
}
else
{
cmFailed("cmSystemTools::UpperCase is working");
}
#endif
#if 0 #if 0
if(NameConflictTest1() == 0 && NameConflictTest2() == 0) if(NameConflictTest1() == 0 && NameConflictTest2() == 0)
{ {