• R/O
  • SSH
  • HTTPS

iutest: コミット


コミットメタ情報

リビジョン1359 (tree)
日時2018-12-06 10:15:30
作者srz_zumix

ログメッセージ

Merge remote-tracking branch 'origin/develop'

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

変更サマリ

差分

--- trunk/bitrise.yml (revision 1358)
+++ trunk/bitrise.yml (revision 1359)
@@ -16,9 +16,9 @@
1616 workflows:
1717 iOS:
1818 steps:
19- - activate-ssh-key@3.1.1:
19+ - activate-ssh-key:
2020 run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
21- - git-clone@3.5.1: {}
21+ - git-clone: {}
2222 - script:
2323 title: Set CACHE env var
2424 inputs:
@@ -30,7 +30,7 @@
3030 envman add --key BREW_OPT_CMAKE --value "/usr/local/opt/cmake"
3131 #envman add --key BREW_CACHE_CMAKE --value "$(brew --cache)/cmake"
3232 - cache-pull@2.0.1: {}
33- - script@1.1.4:
33+ - script:
3434 title: gem install
3535 inputs:
3636 - content: |-
@@ -48,13 +48,13 @@
4848
4949 brew install cmake
5050 brew link cmake
51- - script@1.1.3:
51+ - script:
5252 title: CMake
5353 inputs:
5454 - content: "#!/bin/bash\n# fail if any commands fails\nset -ex\ncmake --version\nmkdir
5555 xcode\ncd xcode\ncmake ../projects/cmake -G \"Xcode\" -DCMAKE_XCODE_GENERATE_SCHEME=TRUE
5656 -Dbuild_use_gtest_configuration=OFF \nls"
57- - script@1.1.4:
57+ - script:
5858 title: Xcodebuild
5959 inputs:
6060 - content: |
@@ -61,7 +61,7 @@
6161 xcodebuild -project xcode/iutest.xcodeproj -list
6262 #xcodebuild -project xcode/iutest.xcodeproj -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=2 build | xcpretty -c
6363 xcodebuild -project xcode/iutest.xcodeproj build | xcpretty -c
64- - script@1.1.4:
64+ - script:
6565 title: Tests
6666 inputs:
6767 - content: |-
@@ -81,9 +81,13 @@
8181 stack: osx-xcode-10.1.x
8282 Android:
8383 steps:
84- - activate-ssh-key@3.1.1:
84+ - script@1.1.5:
85+ inputs:
86+ - content: cat /etc/lsb-release || sw_vers || true
87+ title: Check Stack
88+ - activate-ssh-key:
8589 run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
86- - git-clone@3.4.3: {}
90+ - git-clone: {}
8791 - script@1.1.5:
8892 title: Set cache directory
8993 inputs:
@@ -94,16 +98,43 @@
9498 envman add --key APT_CACHE_DIR --value $CACHE
9599 - cache-pull@2.0.1: {}
96100 - script@1.1.5:
101+ title: SetUp Environments
102+ inputs:
103+ - content: |
104+ #!/usr/bin/env bash
105+ # fail if any commands fails
106+ set -e
107+ # debug log
108+ set -x
109+
110+ env
111+ ls /opt/android-ndk
112+ envman add --key ANDROID_NDK_ROOT --value /opt/android-ndk
113+ envman add --key ANDROID_NDK_HOME --value /opt/android-ndk
114+ - script@1.1.5:
97115 title: CMake
98116 inputs:
99- - content: "#!/bin/bash\n# fail if any commands fails\nset -ex\napt-get install
100- -qq cmake\ncmake --version\nmkdir android-build\ncd android-build\n#cmake
101- ../projects/cmake -G \"Xcode\" -DCMAKE_XCODE_GENERATE_SCHEME=TRUE -Dbuild_use_gtest_configuration=OFF
102- \nls"
103- - script@1.1.3:
117+ - content: |-
118+ #!/bin/bash
119+ # fail if any commands fails
120+ set -ex
121+ #apt-get update
122+ #apt-get install -qq cmake
123+ pip install --upgrade cmake
124+ cmake --version
125+ mkdir android-build
126+ cd android-build
127+ cmake ../projects/cmake -Dbuild_use_gtest_configuration=OFF \
128+ -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \
129+ -DANDROID_ABI=arm64-v8a \
130+ -DANDROID_NATIVE_API_LEVEL=24 \
131+ -DANDROID_STL=c++_static \
132+ -DCMAKE_FIND_DEBUG_MODE=1
133+ ls
134+ - script:
104135 title: Build
105136 inputs:
106- - content: |-
137+ - content: |
107138 #!/bin/bash
108139 # fail if any commands fails
109140 set -e
@@ -110,8 +141,11 @@
110141 # debug log
111142 set -x
112143
113- cd projects/android/iutest_sample
114- ndk-build
144+
145+ #cd projects/android/iutest_sample
146+ #ndk-build
147+
148+ cmake --build ./android-build
115149 - cache-push@2.0.5:
116150 inputs:
117151 - cache_paths: |
@@ -129,3 +163,7 @@
129163 title: Trigger Android workflow
130164 after_run:
131165 - iOS
166+ test:
167+ after_run:
168+ - iOS
169+ - Android
--- trunk/include/iutest_body.hpp (revision 1358)
+++ trunk/include/iutest_body.hpp (revision 1359)
@@ -246,6 +246,7 @@
246246 {
247247 public:
248248 typedef T ParamType; //!< パラメータ型
249+ typedef TestParamInfo<T> TestParamInfoType; //!< パラメータ情報型
249250 protected:
250251 virtual ~WithParamInterface() {}
251252
@@ -274,7 +275,7 @@
274275 /**
275276 * @brief テスト名の生成
276277 */
277- static const ::std::string MakeTestParamName(const TestParamInfo<ParamType>& info)
278+ static const ::std::string MakeTestParamName(const TestParamInfoType& info)
278279 {
279280 return detail::MakeIndexName(info.index);
280281 }
--- trunk/include/iutest_ver.hpp (revision 1358)
+++ trunk/include/iutest_ver.hpp (revision 1359)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01169906u //!< iutest version 1.16.99.6
20+#define IUTEST_VER 0x01169908u //!< iutest version 1.16.99.8
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 0x06u //!< Revision
24+#define IUTEST_REVISION 0x08u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
--- trunk/include/listener/iutest_default_xml_generator.hpp (revision 1358)
+++ trunk/include/listener/iutest_default_xml_generator.hpp (revision 1359)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2016, 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 */
@@ -80,6 +80,7 @@
8080 virtual void OnTestProgramEnd(const UnitTest& test) IUTEST_CXX_OVERRIDE;
8181
8282 private:
83+ virtual bool IsReportable(const UnitTest& test) { IUTEST_UNUSED_VAR(test); return true; }
8384 virtual void OnReportTest(IFile* file, const UnitTest& test);
8485
8586 private:
--- trunk/include/listener/iutest_junit_xml_generator.hpp (revision 1358)
+++ trunk/include/listener/iutest_junit_xml_generator.hpp (revision 1359)
@@ -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 */
@@ -42,6 +42,7 @@
4242 {
4343 }
4444 public:
45+ virtual bool IsReportable(const UnitTest& test) IUTEST_CXX_OVERRIDE;
4546 virtual void OnReportTest(IFile* file, const UnitTest& test) IUTEST_CXX_OVERRIDE;
4647
4748 private:
旧リポジトリブラウザで表示