• R/O
  • SSH
  • HTTPS

iutest: コミット


コミットメタ情報

リビジョン1361 (tree)
日時2019-01-05 00:13:19
作者srz_zumix

ログメッセージ

Merge remote-tracking branch 'origin/develop'

git@361fbf79ac96fe6890f2cae212dd254a18b466c0
https://github.com/srz-zumix/iutest/commit/361fbf79ac96fe6890f2cae212dd254a18b466c0

変更サマリ

差分

--- trunk/COPYING (revision 1360)
+++ trunk/COPYING (revision 1361)
@@ -3,10 +3,11 @@
33 https://github.com/srz-zumix/iutest
44 ----------------------------------------------------------------------
55
6-Copyright (c) 2011-2017, Takazumi Shirayanagi
6+BSD 3-Clause License
7+
8+Copyright (c) 2011-2019, Takazumi Shirayanagi
79 All rights reserved.
810
9-
1011 Redistribution and use in source and binary forms, with or without
1112 modification, are permitted provided that the following conditions are met:
1213
@@ -17,7 +18,7 @@
1718 this list of conditions and the following disclaimer in the documentation
1819 and/or other materials provided with the distribution.
1920
20-* Neither the name of iutest nor the names of its
21+* Neither the name of the copyright holder nor the names of its
2122 contributors may be used to endorse or promote products derived from
2223 this software without specific prior written permission.
2324
@@ -32,7 +33,6 @@
3233 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3334 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3435
35-
3636 ----------------------------------------------------------------------
3737 wandbox-api
3838 https://github.com/srz-zumix/wandbox-api
--- trunk/LICENSE (revision 1360)
+++ trunk/LICENSE (revision 1361)
@@ -1,6 +1,6 @@
11 BSD 3-Clause License
22
3-Copyright (c) 2011-2018, Takazumi Shirayanagi
3+Copyright (c) 2011-2019, Takazumi Shirayanagi
44 All rights reserved.
55
66 Redistribution and use in source and binary forms, with or without
--- trunk/README.md (revision 1360)
+++ trunk/README.md (revision 1361)
@@ -144,7 +144,7 @@
144144 License
145145 --------------------------------------------------
146146
147- Copyright (c) 2011-2018, Takazumi Shirayanagi,
147+ Copyright (c) 2011-2019, Takazumi Shirayanagi,
148148 All rights reserved.
149149
150150 This software is released under the New(3-clause) BSD License, see LICENSE
--- trunk/buddy.yml (revision 1360)
+++ trunk/buddy.yml (revision 1361)
@@ -186,6 +186,18 @@
186186 ref_name: "master"
187187 ref_type: "BRANCH"
188188 actions:
189+ - action: "release-1.8.1"
190+ type: "BUILD"
191+ working_directory: "/buddy/iutest"
192+ docker_image_name: "srzzumix/googletest"
193+ docker_image_tag: "release-1.8.1"
194+ execute_commands:
195+ - "cd test"
196+ - "make USE_GTEST=1 GTEST_EXPECT_VER=0x01080100 test"
197+ - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=0x01080100 test"
198+ mount_filesystem_path: "/buddy/iutest"
199+ shell: "SH"
200+ trigger_condition: "ALWAYS"
189201 - action: "release-1.8.0"
190202 type: "BUILD"
191203 working_directory: "/buddy/iutest"
--- trunk/docs/cover.html (revision 1360)
+++ trunk/docs/cover.html (revision 1361)
@@ -23,7 +23,7 @@
2323 <div class="contents">
2424 <h1>IUTEST</h1>
2525 <div class="text_block">
26-Iris Unit Test Framework : 2018 / 02 / 17<br />
26+Iris Unit Test Framework : 2019 / 01 / 04<br />
2727 <br />
2828 </div>
2929 <h2>はじめに</h2>
@@ -94,34 +94,35 @@
9494 This software is released under the <a href="http://opensource.org/licenses/BSD-3-Clause">New(3-clause) BSD License</a>.<br />
9595
9696 <pre>
97-Copyright (c) 2011-2018, Takazumi Shirayanagi
98-All rights reserved.
97+ BSD 3-Clause License
9998
100-
101-Redistribution and use in source and binary forms, with or without
102-modification, are permitted provided that the following conditions are met:
103-
104-* Redistributions of source code must retain the above copyright notice, this
105- list of conditions and the following disclaimer.
106-
107-* Redistributions in binary form must reproduce the above copyright notice,
108- this list of conditions and the following disclaimer in the documentation
109- and/or other materials provided with the distribution.
110-
111-* Neither the name of iutest nor the names of its
112- contributors may be used to endorse or promote products derived from
113- this software without specific prior written permission.
114-
115-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
116-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
117-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
118-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
119-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
120-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
121-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
122-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
123-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
124-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
99+ Copyright (c) 2011-2019, Takazumi Shirayanagi
100+ All rights reserved.
101+
102+ Redistribution and use in source and binary forms, with or without
103+ modification, are permitted provided that the following conditions are met:
104+
105+ * Redistributions of source code must retain the above copyright notice, this
106+ list of conditions and the following disclaimer.
107+
108+ * Redistributions in binary form must reproduce the above copyright notice,
109+ this list of conditions and the following disclaimer in the documentation
110+ and/or other materials provided with the distribution.
111+
112+ * Neither the name of the copyright holder nor the names of its
113+ contributors may be used to endorse or promote products derived from
114+ this software without specific prior written permission.
115+
116+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
117+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
118+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
119+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
120+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
121+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
122+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
123+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
124+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
125+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
125126 </pre>
126127
127128 </div>
@@ -128,7 +129,7 @@
128129 </div> <!-- end of contents -->
129130
130131 <br />
131-<div class="copyright">Copyright (c) 2011-2017, Takazumi-Shirayanagi, All rights reserved.</div>
132+<div class="copyright">Copyright (c) 2011-2019, Takazumi-Shirayanagi, All rights reserved.</div>
132133
133134 </body>
134135 </html>
--- trunk/include/iutest_ver.hpp (revision 1360)
+++ trunk/include/iutest_ver.hpp (revision 1361)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2018, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01169910u //!< iutest version 1.16.99.10
20+#define IUTEST_VER 0x01169911u //!< iutest version 1.16.99.11
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x16u //!< Minor Version
2323 #define IUTEST_MICROVER 0x99u //!< Micro Version
24-#define IUTEST_REVISION 0x10u //!< Revision
24+#define IUTEST_REVISION 0x11u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -33,24 +33,24 @@
3333 * google group: https://groups.google.com/forum/?fromgroups#!forum/g-iutest \n
3434 *
3535 * @par copyright
36- * Copyright (C) 2011-2018, Takazumi Shirayanagi\n
36+ * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
3737 * This software is released under the new BSD License.
3838 *
3939 * @par LICENSE
4040
41- Redistribution and use in source and binary forms, with or without
42- modification, are permitted provided that the following conditions are met:\n
41+Redistribution and use in source and binary forms, with or without
42+modification, are permitted provided that the following conditions are met: \n
4343 \n
44- * Redistributions of source code must retain the above copyright notice, this
45- list of conditions and the following disclaimer.\n
44+* Redistributions of source code must retain the above copyright notice, this
45+ list of conditions and the following disclaimer. \n
4646 \n
47- * Redistributions in binary form must reproduce the above copyright notice,
48- this list of conditions and the following disclaimer in the documentation
49- and/or other materials provided with the distribution.\n
47+* Redistributions in binary form must reproduce the above copyright notice,
48+ this list of conditions and the following disclaimer in the documentation
49+ and/or other materials provided with the distribution. \n
5050 \n
51- * Neither the name of iutest nor the names of its
52- contributors may be used to endorse or promote products derived from
53- this software without specific prior written permission.\n
51+* Neither the name of the copyright holder nor the names of its
52+ contributors may be used to endorse or promote products derived from
53+ this software without specific prior written permission. \n
5454 \n
5555 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
5656 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--- trunk/test/set_up_testcase_failure_tests.cpp (revision 1360)
+++ trunk/test/set_up_testcase_failure_tests.cpp (revision 1361)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2013-2018, Takazumi Shirayanagi\n
9+ * Copyright (C) 2013-2019, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -62,7 +62,7 @@
6262 #endif
6363 const int ret = IUTEST_RUN_ALL_TESTS();
6464
65-#if defined(IUTEST_USE_GTEST)
65+#if defined(IUTEST_USE_GTEST) && GTEST_VER >= 0x01080100
6666 // "Google Test" fails to set up a test case,
6767 // it does not report a failure, and the test is also continued
6868 if( ret == 1 ) return 1;
旧リポジトリブラウザで表示