summaryrefslogtreecommitdiffstats
path: root/Tests/Module
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2011-08-14 13:42:31 (GMT)
committerStephen Kelly <steveire@gmail.com>2011-08-14 13:45:36 (GMT)
commit10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4 (patch)
tree88b0f0599b07c2457a8bc2b6bc92c278607cc847 /Tests/Module
parent97392a7dd3ca141285e22507bfdae6c640512e76 (diff)
downloadCMake-10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4.zip
CMake-10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4.tar.gz
CMake-10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4.tar.bz2
Disable testing of deprecated macros.
It is not possible to test for it sanely across multiple ancient compilers supported by cmake.
Diffstat (limited to 'Tests/Module')
-rw-r--r--Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt14
-rw-r--r--Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt10
-rw-r--r--Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt14
3 files changed, 19 insertions, 19 deletions
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
index 28d6c65..207534d 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
@@ -17,13 +17,13 @@ endmacro()
static_variant_build_pass("return libshared_and_static_exported();" "Failed to build static variant")
shared_variant_build_pass("return libshared_and_static_exported();" "Failed to build shared variant")
-if (COMPILER_HAS_DEPRECATED)
- shared_variant_build_fail("return libshared_and_static_deprecated();" "Built shared deprecated variant")
- static_variant_build_fail("return libshared_and_static_deprecated();" "Built static deprecated variant")
-else()
- shared_variant_build_pass("return libshared_and_static_deprecated();" "Built shared deprecated variant")
- static_variant_build_pass("return libshared_and_static_deprecated();" "Built static deprecated variant")
-endif()
+# if (COMPILER_HAS_DEPRECATED)
+# shared_variant_build_fail("return libshared_and_static_deprecated();" "Built shared deprecated variant")
+# static_variant_build_fail("return libshared_and_static_deprecated();" "Built static deprecated variant")
+# else()
+# shared_variant_build_pass("return libshared_and_static_deprecated();" "Built shared deprecated variant")
+# static_variant_build_pass("return libshared_and_static_deprecated();" "Built static deprecated variant")
+# endif()
static_variant_build_pass("return libshared_and_static_not_exported();" "Failed to build static not exported variant")
if (WIN32 OR COMPILER_HAS_HIDDEN_VISIBILITY)
diff --git a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
index 288089e..a5804fc 100644
--- a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
@@ -9,11 +9,11 @@ endmacro()
shared_build_pass("Libshared l; return l.libshared_exported();" "Failed to build exported")
-if (COMPILER_HAS_DEPRECATED)
- shared_build_fail("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
-else()
- shared_build_pass("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
-endif()
+# if (COMPILER_HAS_DEPRECATED)
+# shared_build_fail("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# else()
+# shared_build_pass("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# endif()
if (COMPILER_HAS_HIDDEN_VISIBILITY)
shared_build_fail("Libshared l; return l.libshared_excluded();" "Built use of excluded class method. This should not be possible.")
else()
diff --git a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
index 14ca05b..eb6bb87 100644
--- a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
@@ -9,10 +9,10 @@ endmacro()
static_build_pass("Libstatic l; return l.libstatic_exported();" "Failed to build exported.")
-if (COMPILER_HAS_DEPRECATED)
- static_build_fail("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
- static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
-else()
- static_build_pass("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
- static_build_pass("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
-endif()
+# if (COMPILER_HAS_DEPRECATED)
+# static_build_fail("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
+# else()
+# static_build_pass("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# static_build_pass("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
+# endif()