• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1433 (tree)
Time2021-05-03 14:21:12
Authorsrz_zumix

Log Message

Merge pull request #576 from srz-zumix/develop

1.17.99.7
git@fd41cb0292303eb267ae597e077ea45765f37c44
https://github.com/srz-zumix/iutest/commit/fd41cb0292303eb267ae597e077ea45765f37c44


update version

git@cbf383db212978f313043b584ce448e97bdef1fc

Change Summary

Incremental Difference

--- trunk/CHANGES.md (revision 1432)
+++ trunk/CHANGES.md (revision 1433)
@@ -8,6 +8,7 @@
88 * 例外発生時にも SCOPED_TRACE のメッセージを出力するように変更
99 * 空のテストスイート名・テスト名に static_assert を追加
1010 * GoogleTest の GTEST_REMOVE_LEGACY_TEST_CASEAPI_ に対応
11+ * Intel Compiler に対応
1112
1213 * Changes
1314 * TestCase の別名 TestSuite に対応(iutest はどちらもサポートし続けます)
--- trunk/README.md (revision 1432)
+++ trunk/README.md (revision 1433)
@@ -86,6 +86,7 @@
8686 * VC++6~
8787 * GCC 3.4.6~
8888 * Clang 3.1~
89+* Intel Compiler
8990 * Zapcc
9091
9192 Documentation
--- trunk/azure-pipelines.yml (revision 1432)
+++ trunk/azure-pipelines.yml (revision 1433)
@@ -122,6 +122,12 @@
122122 - template: .ci/azure_pipelines/template-make-mix-test.yml
123123 parameters:
124124 name: mix
125+ - stage: ConfigTest
126+ dependsOn: Precheck
127+ jobs:
128+ - template: .ci/azure_pipelines/template-make-config-test.yml
129+ parameters:
130+ name: config
125131 - stage: VisualStudio
126132 dependsOn: Precheck
127133 jobs:
--- trunk/include/internal/iutest_compiler.hpp (revision 1432)
+++ trunk/include/internal/iutest_compiler.hpp (revision 1433)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2021, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -230,6 +230,10 @@
230230 # if (IUTEST_CLANG_MAJOR < 3 || (IUTEST_CLANG_MAJOR == 3 && IUTEST_CLANG_MINOR <= 2))
231231 # define IUTEST_NO_NULL_TO_NULLPTR_T 1 // -Wnull-conversion
232232 # endif
233+# elif defined(__INTEL_COMPILER)
234+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER > 1200
235+# define IUTEST_HAS_NULLPTR 1
236+# endif
233237 # elif defined(__GNUC__)
234238 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
235239 # define IUTEST_HAS_NULLPTR 1
@@ -238,10 +242,6 @@
238242 # if _MSC_VER > 1500
239243 # define IUTEST_HAS_NULLPTR 1
240244 # endif
241-# elif defined(__INTEL_COMPILER)
242-# if __INTEL_COMPILER > 1200
243-# define IUTEST_HAS_NULLPTR 1
244-# endif
245245 # endif
246246 #endif
247247
@@ -263,6 +263,10 @@
263263 # if __has_feature(cxx_auto_type)
264264 # define IUTEST_HAS_AUTO 1
265265 # endif
266+# elif defined(__INTEL_COMPILER)
267+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1200
268+# define IUTEST_HAS_AUTO 1
269+# endif
266270 # elif defined(__GNUC__)
267271 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
268272 # define IUTEST_HAS_AUTO 1
@@ -271,10 +275,6 @@
271275 # if _MSC_VER >= 1600
272276 # define IUTEST_HAS_AUTO 1
273277 # endif
274-# elif defined(__INTEL_COMPILER)
275-# if __INTEL_COMPILER >= 1200
276-# define IUTEST_HAS_AUTO 1
277-# endif
278278 # endif
279279 #endif
280280
@@ -290,6 +290,10 @@
290290 # if __has_feature(cxx_decltype)
291291 # define IUTEST_HAS_DECLTYPE 1
292292 # endif
293+# elif defined(__INTEL_COMPILER)
294+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1200
295+# define IUTEST_HAS_DECLTYPE 1
296+# endif
293297 # elif defined(__GNUC__)
294298 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
295299 # define IUTEST_HAS_DECLTYPE 1
@@ -298,10 +302,6 @@
298302 # if _MSC_VER >= 1600
299303 # define IUTEST_HAS_DECLTYPE 1
300304 # endif
301-# elif defined(__INTEL_COMPILER)
302-# if __INTEL_COMPILER >= 1200
303-# define IUTEST_HAS_DECLTYPE 1
304-# endif
305305 # endif
306306 #endif
307307
@@ -317,6 +317,10 @@
317317 # if __has_feature(cxx_static_assert)
318318 # define IUTEST_HAS_STATIC_ASSERT 1
319319 # endif
320+# elif defined(__INTEL_COMPILER)
321+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER > 1100
322+# define IUTEST_HAS_STATIC_ASSERT 1
323+# endif
320324 # elif defined(__GNUC__)
321325 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
322326 # define IUTEST_HAS_STATIC_ASSERT 1
@@ -325,10 +329,6 @@
325329 # if _MSC_VER >= 1600
326330 # define IUTEST_HAS_STATIC_ASSERT 1
327331 # endif
328-# elif defined(__INTEL_COMPILER)
329-# if __INTEL_COMPILER > 1100
330-# define IUTEST_HAS_STATIC_ASSERT 1
331-# endif
332332 # endif
333333 #endif
334334
@@ -345,6 +345,10 @@
345345 # if __has_feature(cxx_constexpr)
346346 # define IUTEST_HAS_CONSTEXPR 1
347347 # endif
348+# elif defined(__INTEL_COMPILER)
349+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
350+# define IUTEST_HAS_CONSTEXPR 1
351+# endif
348352 # elif defined(__GNUC__)
349353 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
350354 # define IUTEST_HAS_CONSTEXPR 1
@@ -353,10 +357,6 @@
353357 # if _MSC_VER >= 1900 || _MSC_FULL_VER == 180021114
354358 # define IUTEST_HAS_CONSTEXPR 1
355359 # endif
356-# elif defined(__INTEL_COMPILER)
357-# if __INTEL_COMPILER >= 1400
358-# define IUTEST_HAS_CONSTEXPR 1
359-# endif
360360 # endif
361361 #endif
362362
@@ -393,6 +393,10 @@
393393 # if __has_feature(cxx_rvalue_references)
394394 # define IUTEST_HAS_RVALUE_REFS 1
395395 # endif
396+# elif defined(__INTEL_COMPILER)
397+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1200
398+# define IUTEST_HAS_RVALUE_REFS 1
399+# endif
396400 # elif defined(__GNUC__)
397401 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
398402 # define IUTEST_HAS_RVALUE_REFS 1
@@ -401,10 +405,6 @@
401405 # if (_MSC_VER >= 1700)
402406 # define IUTEST_HAS_RVALUE_REFS 1
403407 # endif
404-# elif defined(__INTEL_COMPILER)
405-# if __INTEL_COMPILER >= 1200
406-# define IUTEST_HAS_RVALUE_REFS 1
407-# endif
408408 # endif
409409 #endif
410410
@@ -418,6 +418,10 @@
418418 # if __has_feature(cxx_deleted_functions)
419419 # define IUTEST_HAS_DELETED_FUNCTIONS 1
420420 # endif
421+# elif defined(__INTEL_COMPILER)
422+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1200
423+# define IUTEST_HAS_DELETED_FUNCTIONS 1
424+# endif
421425 # elif defined(__GNUC__)
422426 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
423427 # define IUTEST_HAS_DELETED_FUNCTIONS 1
@@ -426,10 +430,6 @@
426430 # if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 180020827)
427431 # define IUTEST_HAS_DELETED_FUNCTIONS 1
428432 # endif
429-# elif defined(__INTEL_COMPILER)
430-# if __INTEL_COMPILER >= 1200
431-# define IUTEST_HAS_DELETED_FUNCTIONS 1
432-# endif
433433 # endif
434434 #endif
435435
@@ -454,6 +454,10 @@
454454 # if __has_feature(cxx_defaulted_functions)
455455 # define IUTEST_HAS_DEFAULT_FUNCTIONS 1
456456 # endif
457+# elif defined(__INTEL_COMPILER)
458+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1200
459+# define IUTEST_HAS_DEFAULT_FUNCTIONS 1
460+# endif
457461 # elif defined(__GNUC__)
458462 // move assignment operator = default is not works in gcc 4.4
459463 // private destractor = default is not works in gcc 4.5 - 4.6
@@ -472,10 +476,6 @@
472476 # define IUTEST_HAS_MOVE_ASSIGNMENT_DEFAULT_FUNCTION 0
473477 # endif
474478 # endif
475-# elif defined(__INTEL_COMPILER)
476-# if __INTEL_COMPILER >= 1200
477-# define IUTEST_HAS_DEFAULT_FUNCTIONS 1
478-# endif
479479 # endif
480480 #endif
481481
@@ -501,6 +501,10 @@
501501 # if __has_feature(cxx_generalized_initializers)
502502 # define IUTEST_HAS_INITIALIZER_LIST 1
503503 # endif
504+# elif defined(__INTEL_COMPILER)
505+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
506+# define IUTEST_HAS_INITIALIZER_LIST 1
507+# endif
504508 # elif defined(__GNUC__)
505509 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
506510 # define IUTEST_HAS_INITIALIZER_LIST 1
@@ -512,10 +516,6 @@
512516 # define IUTEST_HAS_INITIALIZER_LIST 1
513517 # include <initializer_list>
514518 # endif
515-# elif defined(__INTEL_COMPILER)
516-# if __INTEL_COMPILER >= 1400
517-# define IUTEST_HAS_INITIALIZER_LIST 1
518-# endif
519519 # endif
520520 #endif
521521
@@ -531,6 +531,10 @@
531531 # if __has_feature(cxx_variadic_templates)
532532 # define IUTEST_HAS_VARIADIC_TEMPLATES 1
533533 # endif
534+# elif defined(__INTEL_COMPILER)
535+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER > 1200
536+# define IUTEST_HAS_VARIADIC_TEMPLATES 1
537+# endif
534538 # elif defined(__GNUC__)
535539 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=35722
536540 # if defined(__VARIADIC_TEMPLATES) \
@@ -544,10 +548,6 @@
544548 # define IUTEST_HAS_VARIADIC_TEMPLATES 1
545549 # define IUTEST_HAS_VARIADIC_COMBINE 0
546550 # endif
547-# elif defined(__INTEL_COMPILER)
548-# if __INTEL_COMPILER > 1200
549-# define IUTEST_HAS_VARIADIC_TEMPLATES 1
550-# endif
551551 # endif
552552 #endif
553553
@@ -561,6 +561,8 @@
561561 # if __has_feature(cxx_variadic_templates)
562562 # define IUTEST_HAS_VARIADIC_TEMPLATE_TEMPLATES 1
563563 # endif
564+# elif defined(__INTEL_COMPILER)
565+# define IUTEST_HAS_VARIADIC_TEMPLATE_TEMPLATES IUTEST_HAS_VARIADIC_TEMPLATES
564566 # elif defined(__GNUC__)
565567 # if defined(__VARIADIC_TEMPLATES) || ( ((__GNUC__ > 4) \
566568 || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) \
@@ -570,8 +572,6 @@
570572 # endif
571573 # elif defined(_MSC_VER)
572574 # define IUTEST_HAS_VARIADIC_TEMPLATE_TEMPLATES IUTEST_HAS_VARIADIC_TEMPLATES
573-# elif defined(__INTEL_COMPILER)
574-# define IUTEST_HAS_VARIADIC_TEMPLATE_TEMPLATES IUTEST_HAS_VARIADIC_TEMPLATES
575575 # endif
576576 #endif
577577
@@ -587,6 +587,10 @@
587587 # if __has_feature(cxx_unicode_literals)
588588 # define IUTEST_HAS_CHAR16_T 1
589589 # endif
590+# elif defined(__INTEL_COMPILER)
591+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
592+# define IUTEST_HAS_CHAR16_T 1
593+# endif
590594 # elif defined(__GNUC__)
591595 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
592596 # define IUTEST_HAS_CHAR16_T 1
@@ -595,10 +599,6 @@
595599 # if _MSC_VER >= 1900
596600 # define IUTEST_HAS_CHAR16_T 1
597601 # endif
598-# elif defined(__INTEL_COMPILER)
599-# if __INTEL_COMPILER >= 1400
600-# define IUTEST_HAS_CHAR16_T 1
601-# endif
602602 # endif
603603 #endif
604604
@@ -614,6 +614,10 @@
614614 # if __has_feature(cxx_unicode_literals)
615615 # define IUTEST_HAS_CHAR32_T 1
616616 # endif
617+# elif defined(__INTEL_COMPILER)
618+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
619+# define IUTEST_HAS_CHAR32_T 1
620+# endif
617621 # elif defined(__GNUC__)
618622 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
619623 # define IUTEST_HAS_CHAR32_T 1
@@ -622,10 +626,6 @@
622626 # if _MSC_VER >= 1900
623627 # define IUTEST_HAS_CHAR32_T 1
624628 # endif
625-# elif defined(__INTEL_COMPILER)
626-# if __INTEL_COMPILER >= 1400
627-# define IUTEST_HAS_CHAR32_T 1
628-# endif
629629 # endif
630630 #endif
631631
@@ -641,6 +641,10 @@
641641 # if __has_feature(cxx_lambdas)
642642 # define IUTEST_HAS_LAMBDA 1
643643 # endif
644+# elif defined(__INTEL_COMPILER)
645+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1200
646+# define IUTEST_HAS_LAMBDA 1
647+# endif
644648 # elif defined(__GNUC__)
645649 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
646650 # define IUTEST_HAS_LAMBDA 1
@@ -655,10 +659,6 @@
655659 # define IUTEST_HAS_LAMBDA 1
656660 # define IUTEST_NO_LAMBDA_SCOPE_RESOLUTION // VC++10 lambda v1.0 is not supported.
657661 # endif
658-# elif defined(__INTEL_COMPILER)
659-# if __INTEL_COMPILER >= 1200
660-# define IUTEST_HAS_LAMBDA 1
661-# endif
662662 # endif
663663 #endif
664664
@@ -682,6 +682,10 @@
682682 # if __has_feature(cxx_explicit_conversions)
683683 # define IUTEST_HAS_EXPLICIT_CONVERSION 1
684684 # endif
685+# elif defined(__INTEL_COMPILER)
686+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1300
687+# define IUTEST_HAS_EXPLICIT_CONVERSION 1
688+# endif
685689 # elif defined(__GNUC__)
686690 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
687691 # define IUTEST_HAS_EXPLICIT_CONVERSION 1
@@ -690,10 +694,6 @@
690694 # if (_MSC_VER >= 1800) || (_MSC_FULL_VER == 170051025)
691695 # define IUTEST_HAS_EXPLICIT_CONVERSION 1
692696 # endif
693-# elif defined(__INTEL_COMPILER)
694-# if __INTEL_COMPILER >= 1300
695-# define IUTEST_HAS_EXPLICIT_CONVERSION 1
696-# endif
697697 # endif
698698 #endif
699699
@@ -716,6 +716,10 @@
716716 # if __has_feature(cxx_override_control)
717717 # define IUTEST_HAS_OVERRIDE_AND_FINAL 1
718718 # endif
719+# elif defined(__INTEL_COMPILER)
720+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
721+# define IUTEST_HAS_OVERRIDE_AND_FINAL 1
722+# endif
719723 # elif defined(__GNUC__)
720724 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
721725 # define IUTEST_HAS_OVERRIDE_AND_FINAL 1
@@ -724,10 +728,6 @@
724728 # if _MSC_VER >= 1700
725729 # define IUTEST_HAS_OVERRIDE_AND_FINAL 1
726730 # endif
727-# elif defined(__INTEL_COMPILER)
728-# if __INTEL_COMPILER >= 1400
729-# define IUTEST_HAS_OVERRIDE_AND_FINAL 1
730-# endif
731731 # endif
732732 #endif
733733
@@ -759,6 +759,10 @@
759759 # if __has_feature(cxx_noexcept)
760760 # define IUTEST_HAS_NOEXCEPT 1
761761 # endif
762+# elif defined(__INTEL_COMPILER)
763+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
764+# define IUTEST_HAS_NOEXCEPT 1
765+# endif
762766 # elif defined(__GNUC__)
763767 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
764768 # define IUTEST_HAS_NOEXCEPT 1
@@ -768,10 +772,6 @@
768772 # if _MSC_FULL_VER >= 190022816
769773 # define IUTEST_HAS_NOEXCEPT 1
770774 # endif
771-# elif defined(__INTEL_COMPILER)
772-# if __INTEL_COMPILER >= 1400
773-# define IUTEST_HAS_NOEXCEPT 1
774-# endif
775775 # endif
776776 #endif
777777
@@ -831,12 +831,12 @@
831831 #if !defined(IUTEST_HAS_EXTERN_TEMPLATE)
832832 # if defined(_MSC_VER) && _MSC_VER >= 1400
833833 # define IUTEST_HAS_EXTERN_TEMPLATE 1
834-# elif defined(__GNUC__) || defined(__clang__)
835-# define IUTEST_HAS_EXTERN_TEMPLATE 1
836834 # elif defined(__INTEL_COMPILER)
837-# if __INTEL_COMPILER > 1100
835+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER > 1100
838836 # define IUTEST_HAS_EXTERN_TEMPLATE 1
839837 # endif
838+# elif defined(__GNUC__) || defined(__clang__)
839+# define IUTEST_HAS_EXTERN_TEMPLATE 1
840840 # endif
841841 #endif
842842
@@ -850,6 +850,10 @@
850850 # if __has_feature(cxx_strong_enums)
851851 # define IUTEST_HAS_STRONG_ENUMS 1
852852 # endif
853+# elif defined(__INTEL_COMPILER)
854+# if IUTEST_HAS_CXX11 && __INTEL_COMPILER >= 1400
855+# define IUTEST_HAS_STRONG_ENUMS 1
856+# endif
853857 # elif defined(__GNUC__)
854858 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
855859 # define IUTEST_HAS_STRONG_ENUMS 1
@@ -858,10 +862,6 @@
858862 # if _MSC_VER >= 1700
859863 # define IUTEST_HAS_STRONG_ENUMS 1
860864 # endif
861-# elif defined(__INTEL_COMPILER)
862-# if __INTEL_COMPILER >= 1400
863-# define IUTEST_HAS_STRONG_ENUMS 1
864-# endif
865865 # endif
866866 #endif
867867
@@ -945,6 +945,10 @@
945945 # if (__IBMCPP__ >= 900)
946946 # define IUTEST_HAS_RTTI 1
947947 # endif
948+# elif defined(__INTEL_COMPILER)
949+# if defined(__INTEL_RTTI__) || defined(__cpp_rtti)
950+# define IUTEST_HAS_RTTI 1
951+# endif
948952 # elif defined(_MSC_VER)
949953 # ifdef _CPPRTTI
950954 # define IUTEST_HAS_RTTI 1
--- trunk/include/internal/iutest_pragma.hpp (revision 1432)
+++ trunk/include/internal/iutest_pragma.hpp (revision 1433)
@@ -391,6 +391,20 @@
391391 # define IUTEST_PRAGMA_WARN_DISABLE_NOEXCEPT_TPYE()
392392 #endif
393393
394+#if !defined(IUTEST_PRAGMA_WARN_DISABLE_NONNULL)
395+# if defined(__clang__)
396+# define IUTEST_PRAGMA_WARN_DISABLE_NONNULL() IUTEST_PRAGMA_CLANG_WARN_DISABLE("-Wnonnull")
397+# elif defined(__GNUC__)
398+# define IUTEST_PRAGMA_WARN_DISABLE_NONNULL() IUTEST_PRAGMA_GCC_WARN_DISABLE("-Wnonnull")
399+# elif defined(_MSC_VER)
400+# define IUTEST_PRAGMA_WARN_DISABLE_NONNULL() IUTEST_PRAGMA_MSC_WARN_DISABLE(6387)
401+# endif
402+#endif
403+
404+#if !defined(IUTEST_PRAGMA_WARN_DISABLE_NONNULL)
405+# define IUTEST_PRAGMA_WARN_DISABLE_NONNULL()
406+#endif
407+
394408 #if defined(__clang__)
395409 # if IUTEST_CLANG_MAJOR > 10
396410 # define IUTEST_PRAGMA_IUTEST_WARN_DISABLE_CLANG_11() IUTEST_PRAGMA_CLANG_WARN_DISABLE("-Wsuggest-destructor-override")
--- trunk/include/internal/iutest_type_traits.hpp (revision 1432)
+++ trunk/include/internal/iutest_type_traits.hpp (revision 1433)
@@ -970,7 +970,14 @@
970970 template<typename T>
971971 struct has_equal_to_operator
972972 {
973+#if IUTEST_HAS_DECLTYPE
974+ typedef bool_constant< (sizeof(::std::declval<T>() == ::std::declval<T>()) != sizeof(has_equal_to_operator_helper::no_t) ) > type; // NOLINT
975+#else
976+IUTEST_PRAGMA_WARN_PUSH()
977+IUTEST_PRAGMA_WARN_DISABLE_NONNULL()
973978 typedef bool_constant< (sizeof(*(T*)0 == *(T*)0) != sizeof(has_equal_to_operator_helper::no_t) ) > type; // NOLINT
979+IUTEST_PRAGMA_WARN_POP()
980+#endif
974981 };
975982
976983 IUTEST_PRAGMA_WARN_POP()
--- trunk/include/iutest_ver.hpp (revision 1432)
+++ trunk/include/iutest_ver.hpp (revision 1433)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01179906u //!< iutest version 1.17.99.6
20+#define IUTEST_VER 0x01179907u //!< iutest version 1.17.99.7
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x17u //!< Minor Version
2323 #define IUTEST_MICROVER 0x99u //!< Micro Version
24-#define IUTEST_REVISION 0x06u //!< Revision
24+#define IUTEST_REVISION 0x07u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -127,6 +127,7 @@
127127 <li>例外発生時にも SCOPED_TRACE のメッセージを出力するように変更</li>
128128 <li>空のテストスイート名・テスト名に static_assert を追加</li>
129129 <li>GoogleTest の GTEST_REMOVE_LEGACY_TEST_CASEAPI_ に対応</li>
130+ <li>Intel Compiler に対応</li>
130131 </ul>
131132 </li>
132133 <li>v1.17.1.0
--- trunk/samples/exception.cpp (revision 1432)
+++ trunk/samples/exception.cpp (revision 1433)
@@ -106,15 +106,14 @@
106106
107107 IUTEST(DISABLED_TestFailure, UnexpectedException2)
108108 {
109+IUTEST_PRAGMA_WARN_PUSH()
109110 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
110-IUTEST_PRAGMA_MSC_WARN_DISABLE(6387)
111-IUTEST_PRAGMA_GCC_WARN_PUSH()
112-IUTEST_PRAGMA_GCC_WARN_DISABLE("-Wnonnull")
111+IUTEST_PRAGMA_WARN_DISABLE_NONNULL()
113112
114113 strcpy(NULL, NULL);
115114
116-IUTEST_PRAGMA_GCC_WARN_POP()
117115 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
116+IUTEST_PRAGMA_WARN_POP()
118117 }
119118
120119 #endif
--- trunk/samples/printto.cpp (revision 1432)
+++ trunk/samples/printto.cpp (revision 1433)
@@ -116,7 +116,7 @@
116116 #if IUTEST_HAS_CHAR16_T
117117 IUTEST(PrintToTest, U16String)
118118 {
119- IUTEST_SUCCEED() << ::iutest::PrintToString(u"テスト");
119+ IUTEST_SUCCEED() << ::iutest::PrintToString(u"test");
120120 }
121121 #endif
122122
@@ -123,7 +123,7 @@
123123 #if IUTEST_HAS_CHAR32_T
124124 IUTEST(PrintToTest, U32String)
125125 {
126- IUTEST_SUCCEED() << ::iutest::PrintToString(U"テスト");
126+ IUTEST_SUCCEED() << ::iutest::PrintToString(U"TEST");
127127 }
128128 #endif
129129
--- trunk/test/printers_tests.cpp (revision 1432)
+++ trunk/test/printers_tests.cpp (revision 1433)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2020, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2021, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -265,7 +265,7 @@
265265 {
266266 #if !defined(IUTEST_USE_GTEST)
267267 {
268- const wchar_t* p = L"\U00020BB7野家";
268+ const wchar_t* p = L"\U00020BB7";
269269 const ::std::string s = ::iutest::PrintToString(p);
270270 if( s[0] == '0' )
271271 {
@@ -280,7 +280,7 @@
280280 }
281281 else
282282 {
283- LogChecker ck("\U00020BB7野家");
283+ LogChecker ck("\U00020BB7");
284284 IUTEST_PRINTTOSTRING_EQ(ck, s);
285285 IUTEST_STREAMOUT_CHECK(p);
286286 }
@@ -288,7 +288,7 @@
288288 #endif
289289 #if IUTEST_HAS_CHAR16_T_PRINTABLE
290290 {
291- const char16_t* p = u"\U00020BB7野家";
291+ const char16_t* p = u"\U00020BB7";
292292 const ::std::string s = ::iutest::PrintToString(p);
293293 if( s[0] == '?' )
294294 {
@@ -296,7 +296,7 @@
296296 }
297297 else
298298 {
299- LogChecker ck("\U00020BB7野家");
299+ LogChecker ck("\U00020BB7");
300300 IUTEST_PRINTTOSTRING_EQ(ck, s);
301301 IUTEST_STREAMOUT_CHECK(p);
302302 }
--- trunk/test/syntax_tests.cpp (revision 1432)
+++ trunk/test/syntax_tests.cpp (revision 1433)
@@ -957,7 +957,7 @@
957957 #if IUTEST_HAS_CHAR16_T
958958 IUTEST(PrintToTest, U16String)
959959 {
960- IUTEST_SUCCEED() << u"テスト";
960+ IUTEST_SUCCEED() << u"test";
961961 }
962962
963963 #if IUTEST_HAS_CXX_HDR_STRING_VIEW
@@ -973,7 +973,7 @@
973973 #if IUTEST_HAS_CHAR32_T
974974 IUTEST(PrintToTest, U32String)
975975 {
976- IUTEST_SUCCEED() << U"テスト";
976+ IUTEST_SUCCEED() << U"TEST";
977977 }
978978
979979 #if IUTEST_HAS_CXX_HDR_STRING_VIEW
--- trunk/tools/python/iutest_compile_error_test.py (revision 1432)
+++ trunk/tools/python/iutest_compile_error_test.py (revision 1433)
@@ -202,6 +202,11 @@
202202 help='print input message when failed.'
203203 )
204204 parser.add_argument(
205+ '--allow-unknown-compiler',
206+ action='store_true',
207+ help='ignore unknown compiler.'
208+ )
209+ parser.add_argument(
205210 '--debug',
206211 action='store_true',
207212 help='debug.'
@@ -553,7 +558,14 @@
553558 format_gcc = False
554559 l = parse_vc(options, f)
555560 else:
556- raise Exception("sorry, %s compiler is not supported", (options.compiler))
561+ try:
562+ raise Exception("sorry, {0} compiler is not supported".format(options.compiler))
563+ except Exception as e:
564+ if options.allow_unknown_compiler:
565+ print(e)
566+ return True
567+ else:
568+ raise
557569
558570 if options.debug:
559571 dump_list(l)
--- trunk/tools/wandbox/tests/test_iuwandbox.py (revision 1432)
+++ trunk/tools/wandbox/tests/test_iuwandbox.py (revision 1433)
@@ -26,7 +26,7 @@
2626 root = os.path.normpath(os.path.dirname(os.path.abspath(__file__)) + '/../../../')
2727 fused_src = root + '/fused-src'
2828 test_src = root + '/test/syntax_tests.cpp'
29-test_opt_default = ['--encoding', 'utf-8-sig']
29+test_opt_default = ['--encoding', 'utf-8-sig', '--compiler', 'gcc-10.1.0']
3030 test_opt_nomain = test_opt_default
3131 test_opt = ['-f"-DIUTEST_USE_MAIN"']
3232 test_opt.extend(test_opt_default)
--- trunk/tox.ini (revision 1432)
+++ trunk/tox.ini (revision 1433)
@@ -1,5 +1,5 @@
11 [tox]
2-envlist = py36, py38
2+envlist = py37
33 skipsdist=True
44
55 [testenv]
Show on old repository browser