From 1c44342cffd2badaefd1651c7a95973429e728dc Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 17 Apr 2006 18:10:16 -0400 Subject: [PATCH] ENH: remove duplicate file name test because it fails on xcode --- Tests/Complex/Executable/CMakeLists.txt | 4 ++-- Tests/Complex/Executable/complex.cxx | 4 ++++ Tests/ComplexOneConfig/Executable/CMakeLists.txt | 4 ++-- Tests/ComplexOneConfig/Executable/complex.cxx | 4 ++++ Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 4 ++-- Tests/ComplexRelativePaths/Executable/complex.cxx | 4 ++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index e1a7b6b3f..6a217f03c 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -20,8 +20,8 @@ SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(A A.cxx) -ADD_EXECUTABLE(complex complex testcflags.c - Sub1/NameConflictTest.c Sub2/NameConflictTest.c) +ADD_EXECUTABLE(complex complex testcflags.c ) +# Sub1/NameConflictTest.c Sub2/NameConflictTest.c) ADD_EXECUTABLE(complex.file complex.file.cxx) IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index f126fe58e..a80487b9f 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -290,10 +290,12 @@ void ForceStringUse() extern "C" int TestCFlags(char* m); extern "C" int TestTargetCompileFlags(char* m); +#if 0 // defined in Sub1/NameConflictTest.c extern "C" int NameConflictTest1(); // defined in Sub2/NameConflictTest.c extern "C" int NameConflictTest2(); +#endif // ====================================================================== @@ -400,6 +402,7 @@ int main() cmFailed("cmSystemTools::UpperCase is working"); } #endif +#if 0 if(NameConflictTest1() == 0 && NameConflictTest2() == 0) { cmPassed("Sub dir with same named source works"); @@ -408,6 +411,7 @@ int main() { cmFailed("Sub dir with same named source fails"); } +#endif if(file1() != 1) { cmFailed("Call to file1 function from library failed."); diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index e1a7b6b3f..6a217f03c 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -20,8 +20,8 @@ SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(A A.cxx) -ADD_EXECUTABLE(complex complex testcflags.c - Sub1/NameConflictTest.c Sub2/NameConflictTest.c) +ADD_EXECUTABLE(complex complex testcflags.c ) +# Sub1/NameConflictTest.c Sub2/NameConflictTest.c) ADD_EXECUTABLE(complex.file complex.file.cxx) IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index f126fe58e..a80487b9f 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -290,10 +290,12 @@ void ForceStringUse() extern "C" int TestCFlags(char* m); extern "C" int TestTargetCompileFlags(char* m); +#if 0 // defined in Sub1/NameConflictTest.c extern "C" int NameConflictTest1(); // defined in Sub2/NameConflictTest.c extern "C" int NameConflictTest2(); +#endif // ====================================================================== @@ -400,6 +402,7 @@ int main() cmFailed("cmSystemTools::UpperCase is working"); } #endif +#if 0 if(NameConflictTest1() == 0 && NameConflictTest2() == 0) { cmPassed("Sub dir with same named source works"); @@ -408,6 +411,7 @@ int main() { cmFailed("Sub dir with same named source fails"); } +#endif if(file1() != 1) { cmFailed("Call to file1 function from library failed."); diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index e1a7b6b3f..6a217f03c 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -20,8 +20,8 @@ SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(A A.cxx) -ADD_EXECUTABLE(complex complex testcflags.c - Sub1/NameConflictTest.c Sub2/NameConflictTest.c) +ADD_EXECUTABLE(complex complex testcflags.c ) +# Sub1/NameConflictTest.c Sub2/NameConflictTest.c) ADD_EXECUTABLE(complex.file complex.file.cxx) IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index f126fe58e..a80487b9f 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -290,10 +290,12 @@ void ForceStringUse() extern "C" int TestCFlags(char* m); extern "C" int TestTargetCompileFlags(char* m); +#if 0 // defined in Sub1/NameConflictTest.c extern "C" int NameConflictTest1(); // defined in Sub2/NameConflictTest.c extern "C" int NameConflictTest2(); +#endif // ====================================================================== @@ -400,6 +402,7 @@ int main() cmFailed("cmSystemTools::UpperCase is working"); } #endif +#if 0 if(NameConflictTest1() == 0 && NameConflictTest2() == 0) { cmPassed("Sub dir with same named source works"); @@ -408,6 +411,7 @@ int main() { cmFailed("Sub dir with same named source fails"); } +#endif if(file1() != 1) { cmFailed("Call to file1 function from library failed.");