• R/O
  • SSH
  • HTTPS

iris-fmw: Commit


Commit MetaInfo

Revision252 (tree)
Time2011-12-23 21:33:05
Authorshirayanagi

Log Message

iutest v0.11.1.1
コンパイラ対応強化

Change Summary

Incremental Difference

--- trunk/framework/testsuite/iutest/include/iutest_ver.h (revision 251)
+++ trunk/framework/testsuite/iutest/include/iutest_ver.h (revision 252)
@@ -25,11 +25,11 @@
2525
2626 //======================================================================
2727 // define
28-#define IUTEST_VER 0x00110100 //!< iutest version 0.11.1.0
28+#define IUTEST_VER 0x00110101 //!< iutest version 0.11.1.1
2929 #define IUTEST_MAJORVER 0x00
3030 #define IUTEST_MINORVER 0x11
3131 #define IUTEST_BUILD 0x01
32-#define IUTEST_REVISION 0x00
32+#define IUTEST_REVISION 0x01
3333
3434 } // end of namespace iutest
3535
--- trunk/framework/testsuite/iutest/include/iutest_case.h (revision 251)
+++ trunk/framework/testsuite/iutest/include/iutest_case.h (revision 252)
@@ -251,7 +251,7 @@
251251 virtual std::string testcase_header_string(void) const
252252 {
253253 std::string str = test_case_name();
254-#if IUTEST_ENABLE_RTTI
254+#if defined(IUTEST_ENABLE_RTTI)
255255 str += ", where TypeParam = ";
256256 str += typeid(TypeParam).name();
257257 #endif
--- trunk/framework/testsuite/iutest/include/iutest_defs.h (revision 251)
+++ trunk/framework/testsuite/iutest/include/iutest_defs.h (revision 252)
@@ -49,26 +49,12 @@
4949 #endif
5050
5151 #include <stdio.h>
52+#include "internal/iutest_compiler.h"
5253
5354 #if defined(_IUTEST_DEBUG)
5455 #include "internal/iutest_debug.h"
5556 #endif
5657
57-#include "internal/iutest_compiler.h"
58-
59-// rtti
60-#if defined(_MSC_VER)
61-# ifdef _CPPRTTI
62-# define IUTEST_ENABLE_RTTI 1
63-# endif
64-#elif defined(__MWERKS__)
65-# if __option(RTTI)
66-# define IUTEST_ENABLE_RTTI 1
67-# endif
68-#elif defined(__GNUC__)
69-# define IUTEST_ENABLE_RTTI 1
70-#endif
71-
7258 #if defined(IUTEST_ENABLE_RTTI)
7359 #include <typeinfo>
7460 #endif
--- trunk/framework/testsuite/iutest/include/internal/iutest_compiler.h (revision 251)
+++ trunk/framework/testsuite/iutest/include/internal/iutest_compiler.h (revision 252)
@@ -24,16 +24,19 @@
2424 // define
2525
2626 // constexpr
27-#if defined(__GNUC__)
28-# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
27+#if !defined(IUTEST_NO_CONSTEXPR)
28+# if defined(__GNUC__)
29+# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
30+# define IUTEST_NO_CONSTEXPR
31+# endif
32+# elif defined(_MSC_VER)
2933 # define IUTEST_NO_CONSTEXPR
34+# elif defined(__MWERKS__)
35+# define IUTEST_NO_CONSTEXPR
36+# else
3037 # endif
3138 #endif
3239
33-#if defined(_MSC_VER)
34-# define IUTEST_NO_CONSTEXPR
35-#endif
36-
3740 #ifdef IUTEST_NO_CONSTEXPR
3841 # ifndef constexpr
3942 # define constexpr const
@@ -40,4 +43,63 @@
4043 # endif
4144 #endif
4245
46+// exceptions
47+#if !defined(IUTEST_NO_EXCEPTION)
48+# if defined(__GNUC__)
49+# if !defined(__EXCEPTIONS)
50+# define IUTEST_NO_EXCEPTION
51+# endif
52+# elif defined(__MWERKS__)
53+# if !__option(exceptions)
54+# define IUTEST_NO_EXCEPTION
55+# endif
56+# endif
4357 #endif
58+
59+#ifdef IUTEST_NO_EXCEPTION
60+# define IUTEST_NOT_SUPPORT_EXCEPTION
61+#endif
62+
63+// rtti
64+#if defined(_MSC_VER)
65+# ifdef _CPPRTTI
66+# define IUTEST_ENABLE_RTTI 1
67+# endif
68+#elif defined(__MWERKS__)
69+# if __option(RTTI)
70+# define IUTEST_ENABLE_RTTI 1
71+# endif
72+#elif defined(__GNUC__)
73+# ifdef __RTTI
74+# define IUTEST_ENABLE_RTTI 1
75+# endif
76+#endif
77+
78+// tuple
79+#if defined(_MSC_VER)
80+# if (_MSC_VER >= 1600)
81+# define IUTEST_HAS_TR1_TUPLE 1
82+# endif
83+#elif defined(__GNUC__)
84+# if (!defined(__CUDACC__) && !defined(__ARMCC_VERSION) && (__GNUC__ >= 4))
85+# define IUTEST_HAS_TR1_TUPLE 1
86+# endif
87+#endif
88+
89+#ifdef IUTEST_HAS_TR1_TUPLE
90+
91+#if defined(IUTEST_USE_OWN_TR1_TUPLE)
92+# include "iutest_tuple.h"
93+#else
94+
95+#if (defined(__GNUC__) && (__GNUC__ >= 4))
96+# include <tr1/tuple>
97+#else
98+# include <tuple>
99+#endif
100+
101+#endif
102+
103+#endif
104+
105+#endif
--- trunk/framework/testsuite/iutest/include/internal/iutest_tuple.h (nonexistent)
+++ trunk/framework/testsuite/iutest/include/internal/iutest_tuple.h (revision 252)
@@ -0,0 +1,27 @@
1+//======================================================================
2+//-----------------------------------------------------------------------
3+/**
4+ * @file iutest_tuple.h
5+ * @brief iris unit test version 定義 ファイル
6+ *
7+ * @author t.sirayanagi
8+ * @version 1.0
9+ *
10+ * @par copyright
11+ * Copyright (C) 2011 Takazumi Shirayanagi\n
12+ * The new BSD License is applied to this software.
13+ * see LICENSE
14+*/
15+//-----------------------------------------------------------------------
16+//======================================================================
17+#ifndef INCG_IRIS_iutest_tuple_H_E5143287_CE8A_49a1_8EFB_A10CB2857C9B_
18+#define INCG_IRIS_iutest_tuple_H_E5143287_CE8A_49a1_8EFB_A10CB2857C9B_
19+
20+//======================================================================
21+// include
22+
23+namespace iutest
24+{
25+} // end of namespace iutest
26+
27+#endif
Show on old repository browser