• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1334 (tree)
Time2018-08-18 23:10:35
Authorsrz_zumix

Log Message

Merge remote-tracking branch 'origin/develop'

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

Change Summary

Incremental Difference

--- trunk/README.md (revision 1333)
+++ trunk/README.md (revision 1334)
@@ -5,11 +5,11 @@
55 [![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/master "wercker status")](https://app.wercker.com/project/bykey/d385156052aa4118a7f24affe4a8f851)
66 [![Shippable Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=master)](https://app.shippable.com/github/srz-zumix/iutest)
77 [![Semaphore Build Status](https://semaphoreci.com/api/v1/srz_zumix/iutest/branches/master/badge.svg)](https://semaphoreci.com/srz_zumix/iutest)
8-[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=master&pipelineName=iutest_gtest&accountName=srz-zumix&type=cf-1)](https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:master;service:58a933be9d1bd40100495882~iutest_gtest)
98 [![Bitrise Build Status](https://app.bitrise.io/app/a1525fe176d85f53/status.svg?token=C67enKOhen9rjw_Cl37ihA&branch=master)](https://app.bitrise.io/app/a1525fe176d85f53)
109 [![CircleCI](https://circleci.com/gh/srz-zumix/iutest/tree/master.svg?style=svg)](https://circleci.com/gh/srz-zumix/iutest/tree/master)
1110 [![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)
1211 [![Cirrus Build Status](https://api.cirrus-ci.com/github/srz-zumix/iutest.svg?branch=master)](https://cirrus-ci.com/github/srz-zumix/iutest/master)
12+[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest-test%2Fiutest-test?branch=master&key=eyJhbGciOiJIUzI1NiJ9.NThhNTFmYzlkZjcwMWYwMTAwNjNlYjY3.U-q8LiP3IK9DLygcIx5UOa015KH690k8u3uiLINI9tw&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest-test/builds?filter=trigger:build;branch:master;service:5b68ea9c5904b846f871a6c2~iutest-test)
1313 [![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/master/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/master)
1414 [![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)
1515 [![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)
@@ -110,12 +110,11 @@
110110 |Shippable |[![Shippable Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=master)](https://app.shippable.com/github/srz-zumix/iutest)|[![Run Status](https://api.shippable.com/projects/541904d2ac22859af743f867/badge?branch=develop)](https://app.shippable.com/github/srz-zumix/iutest)|Syntax tests for compiler each version (c++98)|
111111 |Codeship |[![Codeship Status for srz-zumix/iutest](https://app.codeship.com/projects/5bc87030-5b41-0133-6000-4242aa07dce3/status?branch=master)](https://app.codeship.com/projects/110695)|[![Codeship Status for srz-zumix/iutest](https://app.codeship.com/projects/5bc87030-5b41-0133-6000-4242aa07dce3/status?branch=develop)](https://app.codeship.com/projects/110695)|Update documents, Check coding standard of the project|
112112 |Semaphore |[![Semaphore Build Status](https://semaphoreci.com/api/v1/srz_zumix/iutest/branches/master/badge.svg)](https://semaphoreci.com/srz_zumix/iutest)|[![Semaphore Build Status](https://semaphoreci.com/api/v1/srz_zumix/iutest/branches/develop/badge.svg)](https://semaphoreci.com/srz_zumix/iutest)|Scan-build|
113-|Codefresh |[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=master&pipelineName=iutest_gtest&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:master;service:58a933be9d1bd40100495882~iutest_gtest)|[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=develop&pipelineName=iutest_gtest&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:develop;service:58a933be9d1bd40100495882~iutest_gtest)|Google Test compatibility (HEAD)|
114-| |[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=master&pipelineName=iutest_gmock&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:master;service:5988fd7df61a9b000176f0a3~iutest_gmock)|[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=srz-zumix&repoName=iutest&branch=develop&pipelineName=iutest_gmock&accountName=srz-zumix&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest/builds?filter=trigger:build;branch:develop;service:5988fd7df61a9b000176f0a3~iutest_gmock)|Google Mock compatibility (HEAD)|
115113 |Bitrise |[![Bitrise Build Status](https://app.bitrise.io/app/a1525fe176d85f53/status.svg?token=C67enKOhen9rjw_Cl37ihA&branch=master)](https://app.bitrise.io/app/a1525fe176d85f53)|[![Bitrise Build Status](https://app.bitrise.io/app/a1525fe176d85f53/status.svg?token=C67enKOhen9rjw_Cl37ihA&branch=develop)](https://app.bitrise.io/app/a1525fe176d85f53)|iOS|
116114 | |[![Build Status](https://app.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=master)](https://app.bitrise.io/app/aefa67ee488094b1)|[![Build Status](https://app.bitrise.io/app/aefa67ee488094b1/status.svg?token=aDrRgkZEmNFmsDjBM9fWTw&branch=develop)](https://app.bitrise.io/app/aefa67ee488094b1)|Android|
117115 |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|
118116 |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...|
117+|Codefresh |[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest-test%2Fiutest-test?branch=master&key=eyJhbGciOiJIUzI1NiJ9.NThhNTFmYzlkZjcwMWYwMTAwNjNlYjY3.U-q8LiP3IK9DLygcIx5UOa015KH690k8u3uiLINI9tw&type=cf-1)]( https://g.codefresh.io/repositories/srz-zumix/iutest-test/builds?filter=trigger:build;branch:master;service:5b68ea9c5904b846f871a6c2~iutest-test)||Google Test/Google Mock compatibility (HEAD)|
119118 |Buddy |[![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/master/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/master)|[![buddy branch](https://app.buddy.works/zumixcpp/iutest/repository/branch/develop/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy branch")](https://app.buddy.works/zumixcpp/iutest/repository/branch/develop)|arm-none-eabi-gcc build, and below|
120119 ||[![buddy pipeline](https://app.buddy.works/zumixcpp/iutest/pipelines/pipeline/145531/badge.svg?token=5e58135ab4831252209e7b1fe75bfe9de669b0dc7e95ed4316eebad2187d59a0 "buddy pipeline")](https://app.buddy.works/zumixcpp/iutest/pipelines/pipeline/145531)|-|gtest compatible test for released versions|
121120 | |-|[![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|
--- trunk/codefresh.yml (revision 1333)
+++ trunk/codefresh.yml (revision 1334)
@@ -1,38 +1,41 @@
1-version: '1.0'
2-steps:
3- BuildingDockerImage:
4- title: Building Docker Image
5- type: build
6- image_name: srzzumix/iutest
7- dockerfile: .ci/Dockerfile.codefresh
1+# https://github.com/srz-zumix/iutest-test/blob/master/codefresh.yml
82
9- RunningUnitTests:
10- title: Running Unit Tests
11- image: '${{BuildingDockerImage}}'
12- working_directory: IMAGE_WORK_DIR
13- entry_point:
14- - /bin/sh
15- - /codefresh/volume/cf-generated/unit_test_script
16- create_file:
17- path: /codefresh/volume/cf-generated
18- name: unit_test_script
19- content: >-
20- cat /proc/cpuinfo
21-
22- g++ --version
23-
24- # echo | gcc -E -Wp,-v -
25-
26- cd test
27-
28- make -j 4 ${MAKE_OPTION} && make test
29- on_success:
30- metadata:
31- set:
32- - '${{BuildingDockerImage.imageId}}':
33- - CF_QUALITY: true
34- on_fail:
35- metadata:
36- set:
37- - '${{BuildingDockerImage.imageId}}':
38- - CF_QUALITY: false
3+#version: '1.0'
4+#steps:
5+# BuildingDockerImage:
6+# title: Building Docker Image
7+# type: build
8+# image_name: srzzumix/iutest
9+# dockerfile: .ci/Dockerfile.codefresh
10+#
11+# RunningUnitTests:
12+# title: Running Unit Tests
13+# image: '${{BuildingDockerImage}}'
14+# working_directory: IMAGE_WORK_DIR
15+# entry_point:
16+# - /bin/sh
17+# - /codefresh/volume/cf-generated/unit_test_script
18+# create_file:
19+# path: /codefresh/volume/cf-generated
20+# name: unit_test_script
21+# content: >-
22+# cat /proc/cpuinfo
23+#
24+# g++ --version
25+#
26+# # echo | gcc -E -Wp,-v -
27+#
28+# cd test
29+#
30+# make -j 4 ${MAKE_OPTION} && make test
31+# on_success:
32+# metadata:
33+# set:
34+# - '${{BuildingDockerImage.imageId}}':
35+# - CF_QUALITY: true
36+# on_fail:
37+# metadata:
38+# set:
39+# - '${{BuildingDockerImage.imageId}}':
40+# - CF_QUALITY: false
41+#
--- trunk/test/set_up_testcase_failure_tests.cpp (revision 1333)
+++ trunk/test/set_up_testcase_failure_tests.cpp (revision 1334)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2013-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2013-2018, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -64,7 +64,7 @@
6464
6565 if( ret == 0 ) return 1;
6666
67- IUTEST_ASSERT_EXIT( ::iutest::UnitTest::GetInstance()->failed_test_count() == 0 );
67+ IUTEST_ASSERT_EXIT( ::iutest::UnitTest::GetInstance()->failed_test_count() != 2 );
6868 #if !defined(IUTEST_USE_GTEST)
6969 IUTEST_ASSERT_EXIT( setup_flag == 0 );
7070 #else
Show on old repository browser