summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-04-17 22:10:16 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-04-17 22:10:16 (GMT)
commit1c44342cffd2badaefd1651c7a95973429e728dc (patch)
treeaf1b31498256d0ba1f4e424b15a4d72363dacad1 /Tests
parent71b370c79c741f9399d9ea85b854e5c13f889a2d (diff)
downloadCMake-1c44342cffd2badaefd1651c7a95973429e728dc.zip
CMake-1c44342cffd2badaefd1651c7a95973429e728dc.tar.gz
CMake-1c44342cffd2badaefd1651c7a95973429e728dc.tar.bz2
ENH: remove duplicate file name test because it fails on xcode
Diffstat (limited to 'Tests')
-rw-r--r--Tests/Complex/Executable/CMakeLists.txt4
-rw-r--r--Tests/Complex/Executable/complex.cxx4
-rw-r--r--Tests/ComplexOneConfig/Executable/CMakeLists.txt4
-rw-r--r--Tests/ComplexOneConfig/Executable/complex.cxx4
-rw-r--r--Tests/ComplexRelativePaths/Executable/CMakeLists.txt4
-rw-r--r--Tests/ComplexRelativePaths/Executable/complex.cxx4
6 files changed, 18 insertions, 6 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index e1a7b6b..6a217f0 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 f126fe5..a80487b 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 e1a7b6b..6a217f0 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 f126fe5..a80487b 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 e1a7b6b..6a217f0 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 f126fe5..a80487b 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.");