• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1316 (tree)
Time2018-04-30 13:36:04
Authorsrz_zumix

Log Message

update bitrise.yml

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


fix bitrise build

git@d8d41b4372a3fa67f0d39ffc5415b69b36f83799


fix typo

git@c2d2c2d6b830ddf0b3caddbf7419be7e5a8e533a


add buddy badge #44

git@fb8ef85c4c15b4793011a93c61f01d40bceed8b8


fix cpplint

git@34e79532d6ea1d3fd28a8a32df06f36789930a3c


detect gmock 1.4.0

git@e28e8c9260fc6ef0da140bbcf1e1085fecc5338c


fix codefresh build env

git@9b2d6b14c37bdeaf6a535be0498ded3e755f041e


add dockerfile

git@3f75785a89a5ea1671bcee86df19fe16f4706401


gtest 1.3.0 or less is not support

git@6e2026b759d055ae387d06356585416ca017f292


update dockerfile for ci

git@9ccff1a469336be4210213d4d2e73c15ac419a59


fix error with gtest 1.4.0 or less

git@41e585f834c0be9036ab038c568dbf0ec7d03954


fix error with gtest 1.4.0

git@cfb25a03e72dc50b36c0622b52bd5fd72f709058


fix error with gtest 1.4.0

git@026bdc2c2192d2cbbe7263d7ed4a1dc6b500c6d8


update vscode workspace

git@6a53248f8eaf98deeb5c3934f9a99c7e06bad81c


fix error with gtest 1.4.0

git@9d8df04913968f821e62db2d1f23a5be1cd06eca


add Debug_gtest cmake configuration

git@a425ed08da018d9f3c14e58508daafd708ff65d2


fix error with gtest 1.4.0

git@43500cb2214ba86bed755fac6a549a17ff0f600d


add codacy badge

git@09a5cf98ef87b2bdaf18a09831afb96d7dfd2d56


gtest version test add to cmake project

git@5d012d5bce4a63bb6e5d0d5e2884c34fbaf6191e


fix gtest 1.1 compatiblity

git@b2453c131ab3e1aef4a373d2cf4755e85e61dbb2


fix error with google test 1.4.0

git@ead9974b1c403632cd9540d2ba3d63fd2b36816e


fix error with google test 1.4.0

git@ec1cf294e40d72de7589e69f410f702f0d1be248


fix error with google test 1.4.0

git@1dfcda91b8bdfc15860fe5e6d71d0d0c54278651


fix error with google test 1.5.0 or less

git@1e0b1f59df6a5bf21b67389dcb98d3c6709b5998


fix error with google test 1.5.0 or less

git@d16fde80f2e465127b0fe08c74df8aca55653d09


fix error with google test 1.5.0 or less

git@692e71d6b868e94745234fb9b7ed5a4b36e739dc


fix error with google test 1.5.0 or less

git@48b22d9f6eb8ac3ec9fe12d96c06bdd356709445


fix cpplint

git@3478fb1327ad26fab9fbce5f0baba68ebc7f1e7b


update gmock version detect

git@bc51474975e00e4fbd5d5791823262e6e0e35c56


Update GNUmakefile
git@5524e6003d4d4649764d170b6031489ff1baff12


fix arm compile #46

git@355e6ae61e596c7878484a1977e5767528711f8e


remove log

git@76a6a725a6520130ebc6831ef5885ff0659cc1b0


print expect gtest version

git@d945e8a4953e03309643855f29b240b20e235b12


print expect gtest version

git@e3ac6c0650bf3e9e5c0335e3bea119f251544309

Change Summary

Incremental Difference

--- trunk/test/gtest_version_tests.cpp (revision 1315)
+++ trunk/test/gtest_version_tests.cpp (revision 1316)
@@ -22,6 +22,7 @@
2222
2323 IUTEST(GTest, Version)
2424 {
25+ IUTEST_ASSUME_GT(GTEST_EXPECT_VER, 0);
2526 IUTEST_EXPECT_EQ(GTEST_EXPECT_VER, GTEST_VER);
2627 }
2728
@@ -40,9 +41,6 @@
4041
4142 #if defined(IUTEST_USE_GMOCK)
4243
43-// 1.6 以降のみ対応している
44-#if GMOCK_VER >= 0x01060000
45-
4644 #if !defined(GMOCK_EXPECT_VER) && defined(GTEST_EXPECT_VER)
4745 # define GMOCK_EXPECT_VER GTEST_EXPECT_VER
4846 #endif
@@ -51,11 +49,14 @@
5149
5250 IUTEST(GMock, Version)
5351 {
52+ IUTEST_ASSUME_GT(GMOCK_EXPECT_VER, 0);
5453 IUTEST_EXPECT_EQ(GMOCK_EXPECT_VER, GMOCK_VER);
5554 }
5655
5756 #endif
5857
58+#endif
59+
5960 #if !defined(GMOCK_EXPECT_LATEST) && defined(GTEST_EXPECT_LATEST)
6061 # define GMOCK_EXPECT_LATEST GTEST_EXPECT_LATEST
6162 #endif
@@ -69,10 +70,6 @@
6970
7071 #endif
7172
72-#endif
73-
74-#endif
75-
7673 #ifdef UNICODE
7774 int wmain(int argc, wchar_t* argv[])
7875 #else
--- trunk/include/internal/iutest_string.hpp (revision 1315)
+++ trunk/include/internal/iutest_string.hpp (revision 1316)
@@ -25,7 +25,7 @@
2525 #include <wctype.h>
2626 #include <stdarg.h>
2727 #include <errno.h>
28-#if defined(IUTEST_OS_CYGWIN)
28+#if defined(IUTEST_OS_CYGWIN) || defined(IUTEST_OS_ARM)
2929 #include <strings.h>
3030 #endif
3131 #if IUTEST_HAS_STRINGSTREAM
--- trunk/include/util/iutest_util_assertion.hpp (revision 1315)
+++ trunk/include/util/iutest_util_assertion.hpp (revision 1316)
@@ -528,7 +528,7 @@
528528 else
529529 {
530530 return ::iutest::AssertionFailure() << "error: Expected: { " << expr1b << ", " << expr1e << " } == { "
531- << expr2b << ", " << expr2e << " }\n Actual:" << ar.message();
531+ << expr2b << ", " << expr2e << " }\n Actual:" << GetAssertionResultMessage(ar);
532532 }
533533 }
534534
@@ -546,7 +546,7 @@
546546 else
547547 {
548548 return ::iutest::AssertionFailure() << "error: Expected: " << expected_expr << " == " << actual_expr
549- << " \n Actual:" << ar.message();
549+ << " \n Actual:" << GetAssertionResultMessage(ar);
550550 }
551551 }
552552
--- trunk/include/iutest_ver.hpp (revision 1315)
+++ trunk/include/iutest_ver.hpp (revision 1316)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01160214u //!< iutest version 1.16.2.14
20+#define IUTEST_VER 0x01160217u //!< iutest version 1.16.2.17
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x16u //!< Minor Version
2323 #define IUTEST_MICROVER 0x02u //!< Micro Version
24-#define IUTEST_REVISION 0x14u //!< Revision
24+#define IUTEST_REVISION 0x17u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
--- trunk/include/gtest/iutest_gmock_ver.hpp (revision 1315)
+++ trunk/include/gtest/iutest_gmock_ver.hpp (revision 1316)
@@ -34,11 +34,19 @@
3434 #ifndef GMOCK_MINORVER
3535 # if defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_)
3636 # define GMOCK_MINORVER 0x08
37+# define GMOCK_LATEST 1
38+# elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)
39+# define GMOCK_MINORVER 0x08
3740 # elif defined(GMOCK_GMOCK_MORE_MATCHERS_H_)
3841 # define GMOCK_MINORVER 0x07
42+# elif !defined(GMOCK_COMPILE_ASSERT_)
43+# define GMOCK_MINORVER 0x06
44+# elif defined(GMOCK_USES_POSIX_RE)
45+# define GMOCK_MINORVER 0x04
46+# elif defined(GTEST_DISALLOW_COPY_AND_ASSIGN_)
47+# define GMOCK_MINORVER 0x05
3948 # else
40-// v1.6.0 以前は未対応
41-# define GMOCK_MINORVER 0x06
49+# define GMOCK_MINORVER 0x04
4250 # endif
4351 #endif
4452
--- trunk/include/gtest/iutest_switch_for_gtest.hpp (revision 1315)
+++ trunk/include/gtest/iutest_switch_for_gtest.hpp (revision 1316)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2017, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2018, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -59,6 +59,10 @@
5959 #include "iutest_gtest_ver.hpp"
6060 #include "../internal/iutest_pragma.hpp"
6161
62+#if GTEST_VER < 0x01040000
63+# error google test 1.3.0 or less is not supported...
64+#else
65+
6266 //======================================================================
6367 // define
6468
@@ -300,6 +304,15 @@
300304 template<int x>struct StaticAssertionTest {};
301305 }
302306
307+inline const char* GetAssertionResultMessage(const AssertionResult& ar)
308+{
309+#if GTEST_VER <= 0x01040000
310+ return ar.failure_message();
311+#else
312+ return ar.message();
313+#endif
314+}
315+
303316 #if defined(INCG_IRIS_IUTEST_HPP_)
304317
305318 namespace iusupport
@@ -307,9 +320,13 @@
307320 inline AssertionResult iuMakeAssertionResult(const AssertionResult& ar) { return ar; }
308321 inline AssertionResult iuMakeAssertionResult(const ::iutest::AssertionResult& ar)
309322 {
323+#if GTEST_VER > 0x01040000
310324 return AssertionResult(static_cast<bool>(ar)) << ar.message();
325+#else
326+ return static_cast<bool>(ar) ? AssertionSuccess() : AssertionFailure(Message(ar.message()));
327+#endif
311328 }
312-}
329+} // end of namespace iusupport
313330
314331 // ::iutest::AssertionResult -> ::testing::AssertionResult
315332 #undef GTEST_ASSERT_
@@ -318,7 +335,7 @@
318335 if (const ::testing::AssertionResult gtest_ar = ::testing::iusupport::iuMakeAssertionResult(expression)) \
319336 ; \
320337 else \
321- on_failure(gtest_ar.failure_message())
338+ on_failure(GetAssertionResultMessage(gtest_ar))
322339
323340 #endif
324341
@@ -333,6 +350,28 @@
333350 // ostream
334351 typedef ::std::ostream iu_ostream;
335352
353+#if GTEST_VER < 0x01060000
354+
355+namespace dummy_printer
356+{
357+
358+template<typename T>
359+inline ::std::string PrintToString(T)
360+{
361+ // google test 1.5 or less is not supported to PrintToString
362+ return "";
363+}
364+
365+} // end of namespace dummy_printer
366+
367+#if !defined(IUTEST_USE_GMOCK)
368+using dummy_printer::PrintToString;
369+#elif GTEST_VER < 0x01050000
370+using dummy_printer::PrintToString;
371+#endif
372+
373+#endif
374+
336375 } // end of namespace testing
337376
338377 #if defined(INCG_IRIS_IUTEST_HPP_)
@@ -350,4 +389,6 @@
350389
351390 #endif
352391
392+#endif
393+
353394 #endif // INCG_IRIS_IUTEST_SWITCH_FOR_GTEST_HPP_5770CDF3_B5D0_46BC_AAF8_B721902F9871
--- trunk/include/gtest/switch/iutest_switch_core.hpp (revision 1315)
+++ trunk/include/gtest/switch/iutest_switch_core.hpp (revision 1316)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2018, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -169,6 +169,9 @@
169169 #define IUTEST_PP_CAT GTEST_CONCAT_TOKEN_
170170 #define IUTEST_IS_NULLLITERAL GTEST_IS_NULL_LITERAL_
171171
172+#if !defined(GTEST_TEST)
173+# define GTEST_TEST TEST
174+#endif
172175
173176 // __analysis_assume
174177 #if defined(_MSC_VER) && (_MSC_VER >= 1500) && !defined(__CUDACC__)
@@ -188,6 +191,41 @@
188191
189192 #endif
190193
194+#if GTEST_VER <= 0x01040000
195+namespace testing
196+{
197+
198+namespace iusupport
199+{
200+
201+class AssertionResultFailure
202+{
203+ Message m_message;
204+public:
205+ template<typename T>
206+ AssertionResultFailure& operator << (const T& value)
207+ {
208+ m_message << value;
209+ return *this;
210+ }
211+public:
212+ operator AssertionResult () const
213+ {
214+ return testing::AssertionFailure(m_message);
215+ }
216+};
217+
218+} // end of namespace iusupport
219+
220+inline iusupport::AssertionResultFailure AssertionFailure()
221+{
222+ return iusupport::AssertionResultFailure();
223+}
224+
225+} // end of namespace testing
226+
227+#endif
228+
191229 #endif // !defined(IUTEST_USE_GTEST)
192230
193231 #endif // INCG_IRIS_IUTEST_SWITCH_CORE_HPP_0385C393_90D3_4B06_A027_4B07A17A33CB_
--- trunk/include/gtest/switch/iutest_switch_gmock.hpp (revision 1315)
+++ trunk/include/gtest/switch/iutest_switch_gmock.hpp (revision 1316)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2014-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2014-2018, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -101,9 +101,11 @@
101101 using ::testing::EndsWith;
102102
103103 using ::testing::Contains;
104+ using ::testing::ContainerEq;
105+#if GMOCK_VER > 0x01050000
104106 using ::testing::Each;
105- using ::testing::ContainerEq;
106107 using ::testing::Pointwise;
108+#endif
107109 using ::testing::Key;
108110 using ::testing::Pair;
109111 using ::testing::Field;
--- trunk/include/iutest_assertion.hpp (revision 1315)
+++ trunk/include/iutest_assertion.hpp (revision 1316)
@@ -377,6 +377,14 @@
377377 */
378378 inline AssertionResult AssertionFailure() { return AssertionResult::Failure(); }
379379
380+/**
381+ * @brief テスト結果のメッセージを取得する(for compatible)
382+*/
383+inline const char* GetAssertionResultMessage(const AssertionResult& ar)
384+{
385+ return ar.message();
386+}
387+
380388 namespace internal
381389 {
382390
--- trunk/projects/cmake/CMakeLists.txt (revision 1315)
+++ trunk/projects/cmake/CMakeLists.txt (revision 1316)
@@ -7,6 +7,7 @@
77
88 # option
99 option(build_gtest_samples "gtest sample build." OFF)
10+option(build_use_gtest_configuration "use gtest build configuration." ON)
1011 option(build_tests "tests build." ON)
1112
1213 # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
@@ -32,7 +33,6 @@
3233 set(CMAKE_MODULE_PATH ${IUTEST_ROOT_DIR}/cmake)
3334 find_package(IUTEST REQUIRED)
3435
35-
3636 if (COMMAND set_up_hermetic_build)
3737 set_up_hermetic_build()
3838 endif()
@@ -41,8 +41,16 @@
4141 include(internal_utils.cmake)
4242 config_compiler_and_linker() # Defined in internal_utils.cmake.
4343
44+if (build_use_gtest_configuration)
45+ set(CMAKE_CONFIGURATION_TYPES "Debug_gtest;${CMAKE_CONFIGURATION_TYPES}")
46+ message(STATUS "configuration types: ${CMAKE_CONFIGURATION_TYPES}")
47+endif()
48+
4449 # インクルードパス
4550 include_directories(${IUTEST_INCLUDE_DIR})
51+if (NOT "$ENV{GTEST_ROOT}" STREQUAL "")
52+ include_directories($ENV{GTEST_ROOT}/include)
53+endif()
4654
4755 ########################################################################
4856 #
@@ -148,6 +156,7 @@
148156 cxx_executable_test(file_system_tests)
149157 cxx_executable_test(filter_tests)
150158 cxx_executable_test(flagfile_gtest_tests)
159+ cxx_executable_test(gtest_version_tests)
151160 cxx_executable_test(help_tests)
152161 cxx_executable_test(invalid_commandline_tests)
153162 cxx_executable_test(japanese_tests)
@@ -255,6 +264,7 @@
255264 cxx_add_test(file_system_tests)
256265 cxx_add_test(filter_tests)
257266 cxx_add_test(flagfile_gtest_tests)
267+ cxx_add_test(gtest_version_tests)
258268 cxx_add_test(help_tests)
259269 cxx_add_test(invalid_commandline_tests)
260270 cxx_add_test(japanese_tests)
--- trunk/README.md (revision 1315)
+++ trunk/README.md (revision 1316)
@@ -12,6 +12,7 @@
1212 [![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=master)](https://cirrus-ci.com/github/srz-zumix/iutest/master)
1313 [![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)
1414 [![Rocro INSPECODE Report](https://inspecode.rocro.com/badges/github.com/srz-zumix/iutest/report?token=wt0KUnRUG1-Ul2mLrg8ComR1RznZV3VoXecBJHW0EIk&branch=master)](https://inspecode.rocro.com/reports/github.com/srz-zumix/iutest/branch/master/summary)
15+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e6407b63c9c844d080ed71c7707bded9?branch=master)](https://www.codacy.com/app/srz-zumix/iutest?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=srz-zumix/iutest&amp;utm_campaign=Badge_Grade)
1516 [![Coverage Status](https://coveralls.io/repos/github/srz-zumix/iutest/badge.svg?branch=master)](https://coveralls.io/github/srz-zumix/iutest?branch=master)
1617 [![codecov](https://codecov.io/gh/srz-zumix/iutest/branch/master/graph/badge.svg)](https://codecov.io/gh/srz-zumix/iutest)
1718 [![New(3-clause) BSD License](https://img.shields.io/badge/license-New_BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause)
@@ -114,8 +115,10 @@
114115 | |[![Build Status](https://www.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=master)](https://www.bitrise.io/app/aefa67ee488094b1)|[![Build Status](https://www.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=develop)](https://www.bitrise.io/app/aefa67ee488094b1)|Android|
115116 |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|
116117 |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...|
118+|Buddy |-|[![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|
117119 |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|
118120 |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|
121+|Codacy |[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e6407b63c9c844d080ed71c7707bded9?branch=master)](https://www.codacy.com/app/srz-zumix/iutest?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=srz-zumix/iutest&amp;utm_campaign=Badge_Grade)|[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e6407b63c9c844d080ed71c7707bded9?branch=develop)](https://www.codacy.com/app/srz-zumix/iutest?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=srz-zumix/iutest&amp;utm_campaign=Badge_Grade)|Shellcheck, Cppcheck, PyLint, etc...|
119122
120123 Coverage
121124 --------------------------------------------------
--- trunk/bitrise.yml (revision 1315)
+++ trunk/bitrise.yml (revision 1316)
@@ -7,32 +7,44 @@
77 - push_branch: develop
88 workflow: primary
99 - pull_request_source_branch: "*"
10+ pull_request_target_branch: develop
1011 workflow: primary
12+- pull_request_source_branch: "*"
13+ workflow: primary
14+ pull_request_target_branch: master
1115 workflows:
1216 primary:
1317 steps:
1418 - activate-ssh-key@3.1.1:
1519 run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
16- - git-clone@3.4.1: {}
20+ - git-clone@3.5.1: {}
21+ - script@1.1.4:
22+ title: SetUp
23+ inputs:
24+ - content: |-
25+ system_profiler SPHardwareDataType
26+ gem install xcpretty
1727 - script@1.1.3:
1828 title: CMake
1929 inputs:
20- - content: |-
21- #!/bin/bash
22- # fail if any commands fails
23- set -ex
24- brew install cmake
25- cmake --version
26- mkdir xcode
27- cd xcode
28- cmake ../projects/cmake -G "Xcode"
29- ls
30- - script@1.1.3:
30+ - content: "#!/bin/bash\n# fail if any commands fails\nset -ex\nbrew install
31+ cmake\ncmake --version\nmkdir xcode\ncd xcode\ncmake ../projects/cmake
32+ -G \"Xcode\" -DCMAKE_XCODE_GENERATE_SCHEME=TRUE -Dbuild_use_gtest_configuration=OFF
33+ \nls"
34+ - script@1.1.4:
3135 title: Xcodebuild
3236 inputs:
37+ - content: |
38+ xcodebuild -project xcode/iutest.xcodeproj -list
39+ #xcodebuild -project xcode/iutest.xcodeproj -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=2 build | xcpretty -c
40+ xcodebuild -project xcode/iutest.xcodeproj build | xcpretty -c
41+ - script@1.1.4:
42+ title: Tests
43+ inputs:
3344 - content: |-
34- xcodebuild -project xcode/iutest.xcodeproj -list
35- xcodebuild -project xcode/iutest.xcodeproj build
36- #xcodebuild -project xcode/iutest.xcodeproj test
45+ #xcodebuild -project xcode/iutest.xcodeproj -scheme all_tests test
46+ #xcodebuild -project xcode/iutest.xcodeproj -scheme all_tests -destination 'platform=iOS' test
47+ cd xcode
48+ ctest -C Debug -V
3749 after_run:
3850 before_run:
--- trunk/codefresh.yml (revision 1315)
+++ trunk/codefresh.yml (revision 1316)
@@ -4,7 +4,7 @@
44 title: Building Docker Image
55 type: build
66 image_name: srzzumix/iutest
7- dockerfile: tools/docker/codefresh/Dockerfile
7+ dockerfile: .ci/Dockerfile.codefresh
88
99 RunningUnitTests:
1010 title: Running Unit Tests
Show on old repository browser