diff options
author | Brad King <brad.king@kitware.com> | 2015-01-27 16:22:12 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-27 16:22:12 (GMT) |
commit | c1f5d6e6f54f8b61d223476459970d336098429c (patch) | |
tree | 42e324ceb22da2241d4fdff25c030b9613ff1c32 /Tests/CompileFeatures | |
parent | 8eb30339b497a04c4ac2d0879bbeb764a6d51133 (diff) | |
parent | 67e76e82df0fe8466b4bf65265d0c6b7f6046dfb (diff) | |
download | CMake-c1f5d6e6f54f8b61d223476459970d336098429c.zip CMake-c1f5d6e6f54f8b61d223476459970d336098429c.tar.gz CMake-c1f5d6e6f54f8b61d223476459970d336098429c.tar.bz2 |
Merge topic 'test-features-enforce-expectation'
67e76e82 Features: Fix test to reject missing expectation definitions
3046be77 Features: Emit a test failure if 'override' is present but not expected
Diffstat (limited to 'Tests/CompileFeatures')
-rw-r--r-- | Tests/CompileFeatures/genex_test.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp index d9c8eec..2161bca 100644 --- a/Tests/CompileFeatures/genex_test.cpp +++ b/Tests/CompileFeatures/genex_test.cpp @@ -1,9 +1,24 @@ +#ifndef EXPECT_FINAL +# error EXPECT_FINAL not defined +#endif +#ifndef EXPECT_INHERITING_CONSTRUCTORS +# error EXPECT_INHERITING_CONSTRUCTORS not defined +#endif +#ifndef EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL +# error EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL not defined +#endif +#ifndef EXPECT_OVERRIDE_CONTROL +# error EXPECT_OVERRIDE_CONTROL not defined +#endif #if !HAVE_OVERRIDE_CONTROL #if EXPECT_OVERRIDE_CONTROL #error "Expect override control feature" #endif #else +#if !EXPECT_OVERRIDE_CONTROL +#error "Expect no override control feature" +#endif struct A { |