Merge remote-tracking branch 'origin/develop'

README.md

@@ -22,10 +22,12 @@
 
 iutest
 ==========
+
 iutest - iris unit test framework
 
 Welcome to the iutest
 --------------------------------------------------
+
 iutest is framework for writing C++ tests.
 
 Features
@@ -69,10 +71,10 @@ Documentation
 --------------------------------------------------
 
 * in repository  
-doc/index.html  
+  doc/index.html  
 * online document  
-[least released version(OSDN)](http://iutest.osdn.jp/doc/index.html)  
-[github master branch (gh-pages)](http://srz-zumix.github.io/iutest/)  
+  [least released version(OSDN)](http://iutest.osdn.jp/doc/index.html)  
+  [github master branch (gh-pages)](http://srz-zumix.github.io/iutest/)  
 
 Project page
 --------------------------------------------------
@@ -90,11 +92,11 @@ Tools
 --------------------------------------------------
 
 * fused  
-make fused-src.
+  make fused-src.
 * twilio  
-notifies the test results using twilio
+  notifies the test results using twilio
 * wandbox  
-tools to make use of the iutest in [wandbox](https://wandbox.org/)
+  tools to make use of the iutest in [wandbox](https://wandbox.org/)
 
 Tests
 --------------------------------------------------
@@ -116,7 +118,8 @@ Tests
 |           |[![Build Status](https://app.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=master)](https://app.bitrise.io/app/aefa67ee488094b1)|[![Build Status](https://app.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=develop)](https://app.bitrise.io/app/aefa67ee488094b1)|Android|
 |CircleCI   |[![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/master.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/master)|[![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/develop.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/develop)|Optimize options test|
 |Cirrus CI  |[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=master)](https://cirrus-ci.com/github/srz-zumix/iutest/master)|[![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=develop)](https://cirrus-ci.com/github/srz-zumix/iutest/develop)|g++ std=c++14,17...|
-|Buddy      |[![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/master/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/master)|[![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/develop/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/develop)|arm-none-eabi-gcc build|
+|Buddy      |[![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/master/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/master)|[![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/develop/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/develop)|arm-none-eabi-gcc build, and below|
+||[![buddy pipeline](https://app.buddy.works/zumixcpp/iutest/pipelines/pipeline/145531/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy pipeline")](https://app.buddy.works/zumixcpp/iutest/pipelines/pipeline/145531)|-|gtest comaptible test for released versions|
 |           |-|[![buddy pipeline](https://app.buddy.works/zumixcpp/iutest/pipelines/pipeline/129694/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy pipeline")](https://app.buddy.works/zumixcpp/iutest/pipelines/pipeline/129694)|gtest version detect test|
 |Scrutinizer|[![Scrutinizer Build Status](https://scrutinizer-ci.com/g/srz-zumix/iutest/badges/build.png?b=master)](https://scrutinizer-ci.com/g/srz-zumix/iutest/build-status/master)|[![Scrutinizer Build Status](https://scrutinizer-ci.com/g/srz-zumix/iutest/badges/build.png?b=develop)](https://scrutinizer-ci.com/g/srz-zumix/iutest/build-status/develop)|iuwandbox tests|
 |INSPECODE  |[![Job Status](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/status?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=master)](https://inspecode.rocro.com/jobs/github.com/srz-zumix/iutest/latest?completed=true&branch=master)|[![Job Status](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/status?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=develop)](https://inspecode.rocro.com/jobs/github.com/srz-zumix/iutest/latest?completed=true&branch=develop)|Spell check, Cppcheck, cpplint, metrics, scan-build|

docs/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = iutest
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.16.4.7
+PROJECT_NUMBER         = 1.16.4.8
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/gtest/switch/iutest_switch_assert.hpp

@@ -179,8 +179,8 @@
 #define IUTEST_ASSERT_NO_FATAL_FAILURE      ASSERT_NO_FATAL_FAILURE
 
 #ifdef GTEST_OS_WINDOWS
-#  define IUTEST_ASSERT_HRESULT_SUCCEEDED   ASSERT_HRESULT_SUCCEEDED
-#  define IUTEST_ASSERT_HRESULT_FAILED      ASSERT_HRESULT_FAILED
+#  define IUTEST_ASSERT_HRESULT_SUCCEEDED(...)  ASSERT_HRESULT_SUCCEEDED((__VA_ARGS__))
+#  define IUTEST_ASSERT_HRESULT_FAILED(...)     ASSERT_HRESULT_FAILED((__VA_ARGS__))
 #endif
 
 #define IUTEST_ASSERT_PRED1 ASSERT_PRED1

include/gtest/switch/iutest_switch_assume.hpp

@@ -212,10 +212,10 @@
 #define IUTEST_ASSUME_NO_FATAL_FAILURE      ASSUME_NO_FATAL_FAILURE
 
 #ifdef GTEST_OS_WINDOWS
-# define ASSUME_HRESULT_SUCCEEDED(expr) \
-    ASSUME_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-# define ASSUME_HRESULT_FAILED(expr) \
-    ASSUME_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+# define ASSUME_HRESULT_SUCCEEDED(...) \
+    ASSUME_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (__VA_ARGS__))
+# define ASSUME_HRESULT_FAILED(...) \
+    ASSUME_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (__VA_ARGS__))
 
 #  define IUTEST_ASSUME_HRESULT_SUCCEEDED   ASSUME_HRESULT_SUCCEEDED
 #  define IUTEST_ASSUME_HRESULT_FAILED      ASSUME_HRESULT_FAILED

include/gtest/switch/iutest_switch_expect.hpp

@@ -180,8 +180,8 @@
 #define IUTEST_EXPECT_NO_FATAL_FAILURE      EXPECT_NO_FATAL_FAILURE
 
 #ifdef GTEST_OS_WINDOWS
-#  define IUTEST_EXPECT_HRESULT_SUCCEEDED   EXPECT_HRESULT_SUCCEEDED
-#  define IUTEST_EXPECT_HRESULT_FAILED      EXPECT_HRESULT_FAILED
+#  define IUTEST_EXPECT_HRESULT_SUCCEEDED(...)  EXPECT_HRESULT_SUCCEEDED((__VA_ARGS__))
+#  define IUTEST_EXPECT_HRESULT_FAILED(...)     EXPECT_HRESULT_FAILED((__VA_ARGS__))
 #endif
 
 #define IUTEST_EXPECT_PRED1 EXPECT_PRED1

include/gtest/switch/iutest_switch_inform.hpp

@@ -219,10 +219,10 @@
 #define IUTEST_INFORM_NO_FATAL_FAILURE      INFORM_NO_FATAL_FAILURE
 
 #ifdef GTEST_OS_WINDOWS
-# define INFORM_HRESULT_SUCCEEDED(expr) \
-    INFORM_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-# define INFORM_HRESULT_FAILED(expr) \
-    INFORM_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+# define INFORM_HRESULT_SUCCEEDED(...) \
+    INFORM_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (__VA_ARGS__))
+# define INFORM_HRESULT_FAILED(...) \
+    INFORM_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (__VA_ARGS__))
 
 #  define IUTEST_INFORM_HRESULT_SUCCEEDED   INFORM_HRESULT_SUCCEEDED
 #  define IUTEST_INFORM_HRESULT_FAILED      INFORM_HRESULT_FAILED

include/iutest.hpp

@@ -449,15 +449,23 @@
  * @details HRESULT が成功であることを検証します
 */
 #ifndef IUTEST_ASSERT_HRESULT_SUCCEEDED
-#  define IUTEST_ASSERT_HRESULT_SUCCEEDED(hr)       IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_ASSERT_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_ASSERT_HRESULT_SUCCEEDED(...)    IUTEST_TEST_HRESULT_SUCCEEDED((__VA_ARGS__), IUTEST_ASSERT_FAILURE)
+#  else
+#    define IUTEST_ASSERT_HRESULT_SUCCEEDED(hr)     IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_ASSERT_FAILURE)
+#  endif
 #endif
 /**
  * @ingroup IUTEST_ASSERT_
  * @brief   HRESULT の失敗 テスト
  * @details HRESULT が失敗であることを検証します
 */
 #ifndef IUTEST_ASSERT_HRESULT_FAILED
-#  define IUTEST_ASSERT_HRESULT_FAILED(hr)          IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_ASSERT_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_ASSERT_HRESULT_FAILED(...)       IUTEST_TEST_HRESULT_FAILED((__VA_ARGS__), IUTEST_ASSERT_FAILURE)
+#  else
+#    define IUTEST_ASSERT_HRESULT_FAILED(hr)        IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_ASSERT_FAILURE)
+#  endif
 #endif
 
 #if IUTEST_HAS_EXCEPTIONS
@@ -811,15 +819,23 @@
  * @details HRESULT が成功であることを検証します
 */
 #ifndef IUTEST_EXPECT_HRESULT_SUCCEEDED
-#  define IUTEST_EXPECT_HRESULT_SUCCEEDED(hr)       IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_EXPECT_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_EXPECT_HRESULT_SUCCEEDED(...)    IUTEST_TEST_HRESULT_SUCCEEDED((__VA_ARGS__), IUTEST_EXPECT_FAILURE)
+#  else
+#    define IUTEST_EXPECT_HRESULT_SUCCEEDED(hr)     IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_EXPECT_FAILURE)
+#  endif
 #endif
 /**
  * @ingroup IUTEST_EXPECT_
  * @brief   HRESULT の失敗 テスト
  * @details HRESULT が失敗であることを検証します
 */
 #ifndef IUTEST_EXPECT_HRESULT_FAILED
-#  define IUTEST_EXPECT_HRESULT_FAILED(hr)          IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_EXPECT_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_EXPECT_HRESULT_FAILED(...)       IUTEST_TEST_HRESULT_FAILED((__VA_ARGS__), IUTEST_EXPECT_FAILURE)
+#  else
+#    define IUTEST_EXPECT_HRESULT_FAILED(hr)        IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_EXPECT_FAILURE)
+#  endif
 #endif
 
 #if IUTEST_HAS_EXCEPTIONS
@@ -1183,15 +1199,23 @@
  * @details HRESULT が成功であることを検証します
 */
 #ifndef IUTEST_INFORM_HRESULT_SUCCEEDED
-#  define IUTEST_INFORM_HRESULT_SUCCEEDED(hr)       IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_INFORM_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_INFORM_HRESULT_SUCCEEDED(...)    IUTEST_TEST_HRESULT_SUCCEEDED((__VA_ARGS__), IUTEST_INFORM_FAILURE)
+#  else
+#    define IUTEST_INFORM_HRESULT_SUCCEEDED(hr)     IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_INFORM_FAILURE)
+#  endif
 #endif
 /**
  * @ingroup IUTEST_INFORM_
  * @brief   HRESULT の失敗 テスト
  * @details HRESULT が失敗であることを検証します
 */
 #ifndef IUTEST_INFORM_HRESULT_FAILED
-#  define IUTEST_INFORM_HRESULT_FAILED(hr)          IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_INFORM_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_INFORM_HRESULT_FAILED(...)       IUTEST_TEST_HRESULT_FAILED((__VA_ARGS__), IUTEST_INFORM_FAILURE)
+#  else
+#    define IUTEST_INFORM_HRESULT_FAILED(hr)        IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_INFORM_FAILURE)
+#  endif
 #endif
 
 #if IUTEST_HAS_EXCEPTIONS
@@ -1537,15 +1561,23 @@
  * @details HRESULT が成功であることを検証します
 */
 #ifndef IUTEST_ASSUME_HRESULT_SUCCEEDED
-#  define IUTEST_ASSUME_HRESULT_SUCCEEDED(hr)       IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_ASSUME_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_ASSUME_HRESULT_SUCCEEDED(...)    IUTEST_TEST_HRESULT_SUCCEEDED((__VA_ARGS__), IUTEST_ASSUME_FAILURE)
+#  else
+#    define IUTEST_ASSUME_HRESULT_SUCCEEDED(hr)     IUTEST_TEST_HRESULT_SUCCEEDED(hr, IUTEST_ASSUME_FAILURE)
+#  endif
 #endif
 /**
  * @ingroup IUTEST_ASSUME_
  * @brief   HRESULT の失敗 テスト
  * @details HRESULT が失敗であることを検証します
 */
 #ifndef IUTEST_ASSUME_HRESULT_FAILED
-#  define IUTEST_ASSUME_HRESULT_FAILED(hr)          IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_ASSUME_FAILURE)
+#  ifndef IUTEST_NO_VARIADIC_MACROS
+#    define IUTEST_ASSUME_HRESULT_FAILED(...)       IUTEST_TEST_HRESULT_FAILED((__VA_ARGS__), IUTEST_ASSUME_FAILURE)
+#  else
+#    define IUTEST_ASSUME_HRESULT_FAILED(hr)        IUTEST_TEST_HRESULT_FAILED(hr, IUTEST_ASSUME_FAILURE)
+#  endif
 #endif
 
 #if IUTEST_HAS_EXCEPTIONS

include/iutest_ver.hpp

@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define IUTEST_VER          0x01160407u //!< iutest version 1.16.4.7
+#define IUTEST_VER          0x01160408u //!< iutest version 1.16.4.8
 #define IUTEST_MAJORVER     0x01u       //!< Major Version
 #define IUTEST_MINORVER     0x16u       //!< Minor Version
 #define IUTEST_MICROVER     0x04u       //!< Micro Version
-#define IUTEST_REVISION     0x07u       //!< Revision
+#define IUTEST_REVISION     0x08u       //!< Revision
 
 #define IUTEST_BUILD        IUTEST_MICROVER //!< @deprecated
 
@@ -123,6 +123,7 @@
   <li>v1.16.5.0
     <ul>
       <li>IUTEST_*_NULL, IUTEST_*_NOTNULL を可変長引数対応</li>
+      <li>IUTEST_*_HRESULT_SUCCEEDED, IUTEST_*_HRESULT_FAILED を可変長引数対応</li>
       <li>ad_hoc_testresult の取得関数名を ad_hoc_test_result に変更</li>
       <li>compatibility: iuutil に ad_hoc_testresult の取得関数を追加</li>
       <li>iuwandbox で std-cxx の指定をするとオプションチェックで失敗する不具合を修正</li>

test/syntax_tests.cpp

@@ -50,13 +50,13 @@ IUTEST(SyntaxTest, True)
 IUTEST(SyntaxTest, VariadicTrue)
 {
     if( bool b = true )
-        IUTEST_ASSERT_TRUE(T<0,0>::call(b)) << b;
+        IUTEST_ASSERT_TRUE(T<0, 0>::call(b)) << b;
     if( bool b = true )
-        IUTEST_EXPECT_TRUE(T<0,0>::call(b)) << b;
+        IUTEST_EXPECT_TRUE(T<0, 0>::call(b)) << b;
     if( bool b = true )
-        IUTEST_INFORM_TRUE(T<0,0>::call(b)) << b;
+        IUTEST_INFORM_TRUE(T<0, 0>::call(b)) << b;
     if( bool b = true )
-        IUTEST_ASSUME_TRUE(T<0,0>::call(b)) << b;
+        IUTEST_ASSUME_TRUE(T<0, 0>::call(b)) << b;
 }
 #endif
 
@@ -77,13 +77,13 @@ IUTEST(SyntaxTest, False)
 IUTEST(SyntaxTest, VariadicFalse)
 {
     if( bool b = false )
-        IUTEST_ASSERT_FALSE(T<0,0>::call(b)) << b;
+        IUTEST_ASSERT_FALSE(T<0, 0>::call(b)) << b;
     if( bool b = false )
-        IUTEST_EXPECT_FALSE(T<0,0>::call(b)) << b;
+        IUTEST_EXPECT_FALSE(T<0, 0>::call(b)) << b;
     if( bool b = false )
-        IUTEST_INFORM_FALSE(T<0,0>::call(b)) << b;
+        IUTEST_INFORM_FALSE(T<0, 0>::call(b)) << b;
     if( bool b = false )
-        IUTEST_ASSUME_FALSE(T<0,0>::call(b)) << b;
+        IUTEST_ASSUME_FALSE(T<0, 0>::call(b)) << b;
 }
 
 #endif
@@ -244,13 +244,13 @@ IUTEST(SyntaxTest, VariadicNull)
 {
     int* p = NULL;
     if( int x = 1 )
-        IUTEST_ASSERT_NULL(T<0,0>::call(p)) << x;
+        IUTEST_ASSERT_NULL(T<0, 0>::call(p)) << x;
     if( int x = 1 )
-        IUTEST_EXPECT_NULL(T<0,0>::call(p)) << x;
+        IUTEST_EXPECT_NULL(T<0, 0>::call(p)) << x;
     if( int x = 1 )
-        IUTEST_INFORM_NULL(T<0,0>::call(p)) << x;
+        IUTEST_INFORM_NULL(T<0, 0>::call(p)) << x;
     if( int x = 1 )
-        IUTEST_ASSUME_NULL(T<0,0>::call(p)) << x;
+        IUTEST_ASSUME_NULL(T<0, 0>::call(p)) << x;
 }
 #endif
 
@@ -270,13 +270,13 @@ IUTEST(SyntaxTest, NotNull)
 IUTEST(SyntaxTest, VariadicNotNull)
 {
     if( void* p = this )
-        IUTEST_ASSERT_NOTNULL(T<0,0>::call(p)) << p;
+        IUTEST_ASSERT_NOTNULL(T<0, 0>::call(p)) << p;
     if( void* p = this )
-        IUTEST_EXPECT_NOTNULL(T<0,0>::call(p)) << p;
+        IUTEST_EXPECT_NOTNULL(T<0, 0>::call(p)) << p;
     if( void* p = this )
-        IUTEST_INFORM_NOTNULL(T<0,0>::call(p)) << p;
+        IUTEST_INFORM_NOTNULL(T<0, 0>::call(p)) << p;
     if( void* p = this )
-        IUTEST_ASSUME_NOTNULL(T<0,0>::call(p)) << p;
+        IUTEST_ASSUME_NOTNULL(T<0, 0>::call(p)) << p;
 }
 #endif
 
@@ -372,6 +372,20 @@ IUTEST(SyntaxTest, HResultSucceeded)
         IUTEST_ASSUME_HRESULT_SUCCEEDED(0) << x;
 }
 
+#ifndef IUTEST_NO_VARIADIC_MACROS
+IUTEST(SyntaxTest, VariadicHResultSucceeded)
+{
+    if( int x=1 )
+        IUTEST_ASSERT_HRESULT_SUCCEEDED(T<0, 0>::call(0)) << x;
+    if( int x=1 )
+        IUTEST_EXPECT_HRESULT_SUCCEEDED(T<0, 0>::call(0)) << x;
+    if( int x=1 )
+        IUTEST_INFORM_HRESULT_SUCCEEDED(T<0, 0>::call(0)) << x;
+    if( int x=1 )
+        IUTEST_ASSUME_HRESULT_SUCCEEDED(T<0, 0>::call(0)) << x;
+}
+#endif
+
 IUTEST(SyntaxTest, HResultFailed)
 {
     if( int x=1 )
@@ -384,6 +398,20 @@ IUTEST(SyntaxTest, HResultFailed)
         IUTEST_ASSUME_HRESULT_FAILED(-1) << x;
 }
 
+#ifndef IUTEST_NO_VARIADIC_MACROS
+IUTEST(SyntaxTest, VariadicHResultFailed)
+{
+    if( int x=1 )
+        IUTEST_ASSERT_HRESULT_FAILED(T<0, 0>::call(-1)) << x;
+    if( int x=1 )
+        IUTEST_EXPECT_HRESULT_FAILED(T<0, 0>::call(-1)) << x;
+    if( int x=1 )
+        IUTEST_INFORM_HRESULT_FAILED(T<0, 0>::call(-1)) << x;
+    if( int x=1 )
+        IUTEST_ASSUME_HRESULT_FAILED(T<0, 0>::call(-1)) << x;
+}
+#endif
+
 #endif
 
 IUTEST(SyntaxTest, Pred1)
@@ -650,9 +678,9 @@ IUTEST(SyntaxTest, ExceptionAnyThrow)
     if( int x = 1 )
         IUTEST_ASSERT_ANY_THROW(throw ::std::bad_exception()) << x;
     if( int x = 1 )
-        IUTEST_ASSERT_ANY_THROW(throw ::std::bad_exception()) << x;
+        IUTEST_EXPECT_ANY_THROW(throw ::std::bad_exception()) << x;
     if( int x = 1 )
-        IUTEST_ASSERT_ANY_THROW(throw ::std::bad_exception()) << x;
+        IUTEST_INFORM_ANY_THROW(throw ::std::bad_exception()) << x;
     if( int x = 1 )
         IUTEST_ASSUME_ANY_THROW(throw ::std::bad_exception()) << x;
 }