Browse Source

Disable testing of deprecated macros.

It is not possible to test for it sanely across multiple ancient
compilers supported by cmake.
Stephen Kelly 14 years ago
parent
commit
10d8c446d5

+ 7 - 7
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)

+ 5 - 5
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()

+ 7 - 7
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()