• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revisión1408 (tree)
Tiempo2020-05-06 17:01:13
Autorsrz_zumix

Log Message

Merge remote-tracking branch 'origin/develop'

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


Merge remote-tracking branch 'origin/develop'

git@b4a7ec3e7e50e34b88c8953de5dc7f91fe71b465


add github.com

git@50498a76aafc9caa0e90de7b6d56d3787a1941c0


Merge remote-tracking branch 'origin/develop'

git@44b1690d7810001b9af203f353876204df8cd97f


update doc [ci skip]

git@2ba7c69c0aa6f134ae537f17cb1f94c09096f789


Merge remote-tracking branch 'origin/develop'

git@3ccf58d478d82403218d639add12f274ffb10dd1


Merge pull request #431 from srz-zumix/feature/update_osdn_release_dockerfile

fix lang [ci skip]
git@4ded063e7353c5874c253a7c465020e08833ef66


Merge pull request #430 from srz-zumix/feature/wandbox_response_none

iuwandbox json decode error
git@a28b3fbe2ac1a1f4b0e7e6adf10b5d48b949c30e


Merge pull request #429 from srz-zumix/feature/osdn_hostkeychecking_no

add ssh config
git@a192985ce262cc759d751c518b415bcc514c5808


fix lang [ci skip]

git@b1e3413af6e20cbce3f55d45d24d6e6ddccda6fc


iuwandbox json decode error

git@b1a44e10b346830998ef5876a5ea048e869fb476


tag to latest (#428)

* tag to latest

* copy to root on master
git@420e845cf82db376194c3a63701e5661efb14365


update README [ci skip]

git@3be4d0b93c4e3f8d668ddf14638010cfed147281


add ssh config

git@e8d5f4f5229748cd14ef688a82dc85ffbf64a32e


Merge remote-tracking branch 'origin/develop'

git@eb8017c1ed4eda29eee956937e533ae632d1bdb5


v1.17.0.7

git@d1a6e1201d17b7e081fa9787d8fc8c4ba563ede0


support local run (#426)

* support local run

* update
git@9782bae0c7089e9adc274cd14083a1b49c020572


Codeship/sync svn (#425)

* add sync-svn step

* +x

* fix lint

* fix lint
git@ea1b597c8ebf13d79f29eb9f2b4ad905d1667c44


GitHub Pages の更新を GitHub Actions に移行 (#424)

git@e797c2cbc3b30c826bd63f8df5b53be19ba2aa1b


Merge remote-tracking branch 'origin/develop'

git@66b72a2f2766e7b3ad1d9f692448cceb26e06663


add .scrutinizer.yml (#422)

* add .scrutinizer.yml

* command
git@def81bddd88283e98f7511866f5c8763124ee7c9


add clang 10.0.0 (#420)

git@efec46728536148c80d06c5e3b9a230e3d6d75ab


update docker (#421)

* update docker

* up

* up

* update python env
git@df2067e05e3e1ae650604f01211c74b74cba8ba3


push docker hub (#419)

* no build docker image

* rm quality

* create docker hub

* fix image name
git@38fe7dc01fd859ac4c68212f7c76c87afe28081e


python3 (#418)

* python3

* fix box

* update

* update
git@ff68cd72775d5d9838fa80bc6baa1d8ccd31f3f3


Merge remote-tracking branch 'origin/develop'

git@4715ecbe8d6998a121a47c3bdbd15cfd9fe1cdb8


version 1.17.0.6

git@bbb553376a20fe8d83b0a45f94d39b8f9bfab1d9


Merge remote-tracking branch 'origin/develop'

git@cf8455268e6ab2aa5a3286b0aff51e068186e0fd


short name for non variadic templates (#414)

* short name for non variadic templates

* update

* fix cpplint

* update clang-10

* revert
git@6e91acfc5bf5d07b82e4b4f5a2f7ab0d5c2e49d3


codeship pro (#417)

git@193dd4eb8cdc8434a879c3bd7bbc9c7998fc2905


Merge pull request #416 from srz-zumix/faeture/update_wandbox

fix wandbox-api update
git@bfda704435a38babe6fd2fa06be949aaab6aef77


fix

git@c45c0f7ab18b5eaa1cca1f74f8e9f9d683d8f859


fix wandbox-api update

git@755aa699135ac0849a6f9fc5105b79d31de11c92


Merge pull request #415 from srz-zumix/circleci/update

eoan
git@92d2cdfe608f8329df69379fdd6c9f406f8c3049


eoan

git@bb4fc2cade81e3411525fdd974c097ff6d221123


Merge pull request #413 from srz-zumix/semaphore/path_filter

path filter
git@6db77a75b89a1a25aa3400d2315f772513622bad


path filter

git@f77444543943f2f3f26cd7003bd676790556e40c


Drone/parallel (#412)

git@d204f875d5fb0b6d7d2eae48b1baacc2818c9659


Add GetTypeName test (#404)

git@305dd7419a113862b256659cfdd32f8f8f1888cf


greetings

git@640eff2b7cce42e93ea8a64d2011eac11a25b60b


update install script (#411)

git@527e4f38fad899af3f519227732a3118407fced1


Merge pull request #410 from srz-zumix/shippable/update_yml

update shippable
git@50b0372bb2adbec35228712e02a720bd9cce61fb


update shippable

git@a6ea09926c6dd2a706c5f9574253d9069e5e2e15

Cambiar Resumen

Diferencia incremental

--- trunk/Makefile (revision 1407)
+++ trunk/Makefile (revision 1408)
@@ -1,7 +1,7 @@
11 #
22 #
33 #
4-# Copyright (C) 2018, Takazumi Shirayanagi
4+# Copyright (C) 2018-2020, Takazumi Shirayanagi
55 # This software is released under the new BSD License,
66 # see LICENSE
77
--- trunk/README.md (revision 1407)
+++ trunk/README.md (revision 1408)
@@ -23,9 +23,9 @@
2323 [![Coverity Scan Build Status](https://scan.coverity.com/projects/1316/badge.svg)](https://scan.coverity.com/projects/srz-zumix-iutest)
2424 [![GuardRails badge](https://badges.guardrails.io/srz-zumix/iutest.svg?token=fe1bb5ca5f743800d26e4d2b7282c5b316df83c0b228048f4192510bdd7280f0)](https://dashboard.guardrails.io/default/gh/srz-zumix/iutest)
2525 [![GitHub Actions reviewdog Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions%20-%20reviewdog/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+-+reviewdog%22)
26-[![New(3-clause) BSD License](https://img.shields.io/badge/license-New_BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause)
26+[![New(3-clause) BSD License](https://img.shields.io/badge/license-New_BSD-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
2727 [![NuGet version](https://badge.fury.io/nu/iutest.svg)](https://badge.fury.io/nu/iutest)
28-[![support](https://img.shields.io/badge/%24-support-orange.svg)](http://amzn.asia/6fNxDZU)
28+[![support](https://img.shields.io/badge/%24-support-orange.svg)](https://amzn.asia/6fNxDZU)
2929
3030 iutest
3131 ==========
@@ -81,13 +81,13 @@
8181 * in repository
8282 doc/index.html
8383 * online document
84- [least released version(OSDN)](http://iutest.osdn.jp/doc/index.html)
85- [GitHub master branch (gh-pages)](http://srz-zumix.github.io/iutest/)
84+ [latest released version](https://srz-zumix.github.io/iutest/latest)
85+ [GitHub master branch](https://srz-zumix.github.io/iutest/master)
8686
8787 Project page
8888 --------------------------------------------------
8989
90-* [OSDN Project page](http://iutest.osdn.jp/)
90+* [OSDN Project page](https://iutest.osdn.jp/)
9191 * [GitHub](https://github.com/srz-zumix/iutest)
9292
9393 Support
@@ -120,19 +120,20 @@
120120 |[Cirrus CI](https://cirrus-ci.org/)|[![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++/clang std=c++14,17.. Basic tests, FreeBSD Basic tests|
121121 |[Codacy](https://www.codacy.com/)|[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e6407b63c9c844d080ed71c7707bded9?branch=master)](https://www.codacy.com/app/srz-zumix/iutest?utm_source=github.com&utm_medium=referral&utm_content=srz-zumix/iutest&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&utm_medium=referral&utm_content=srz-zumix/iutest&utm_campaign=Badge_Grade)|Shellcheck, Cppcheck, PyLint, etc...|
122122 |[Codefresh](https://codefresh.io/)|[![Codefresh build status](https://g.codefresh.io/api/badges/pipeline/srz-zumix/iutest%2Fiutest_unittest?branch=master&type=cf-1)](https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|[![Codefresh build status](https://g.codefresh.io/api/badges/pipeline/srz-zumix/iutest%2Fiutest_unittest?branch=develop&type=cf-1)](https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:develop;pipeline:58a933be9d1bd40100495882~iutest_unittest)|Build tools/docker/Dockerfile, Benchmark test, Gcc 8/9 basic test|
123-|[Codeship](https://codeship.com/)|[![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|
123+|[Codeship](https://codeship.com/)|[![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)|Check coding standard of the project|
124124 |[Coverity Scan](https://scan.coverity.com)|[![Coverity Scan Build Status](https://scan.coverity.com/projects/1316/badge.svg)](https://scan.coverity.com/projects/srz-zumix-iutest)||Coverity Scan|
125125 |[Drone Cloud](https://cloud.drone.io)|[![Drone Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=master)](https://cloud.drone.io/srz-zumix/iutest)|[![Build Status](https://cloud.drone.io/api/badges/srz-zumix/iutest/status.svg?branch=develop)](https://cloud.drone.io/srz-zumix/iutest)|gtest compatible test for released versions / gtest version detect test|
126126 |[GitHub Actions](https://github.com/srz-zumix/iutest/actions?query=workflow%3A"GitHub+Actions")|[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=master)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions%22+branch%3Amaster)|[![GitHub Actions Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions%22+branch%3Adevelop)|Basic test (Windows LLVM clang and mingw), EditorConfig Lint, Include What You Use, arm-none-eabi-gcc build|
127127 |[GitHub Actions reviewdog](https://github.com/srz-zumix/iutest/actions?query=workflow%3A"GitHub+Actions+reviewdog")|[![GitHub Actions Reviewdog Status](https://github.com/srz-zumix/iutest/workflows/GitHub%20Actions%20-%20reviewdog/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHub+Actions+-+reviewdog%22+branch%3Amaster)||Reviewdog (shellcheck, cpplint)|
128+|[GitHub Actions Update GitHubPages](https://github.com/srz-zumix/iutest/actions?query=workflow%3A"GitHubPages")|[![Update GitHubPages Status](https://github.com/srz-zumix/iutest/workflows/GitHubPages/badge.svg?branch=develop)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHubPages%22+branch%3Amaster)||Update documents|
128129 |[GitLab CI](https://about.gitlab.com/product/continuous-integration/)|[![GitLab CI pipeline status](https://gitlab.com/srz-zumix/iutest-test/badges/master/pipeline.svg)](https://gitlab.com/srz-zumix/iutest-test/commits/master)|[![GitLab CI pipeline status](https://gitlab.com/srz-zumix/iutest-test/badges/develop/pipeline.svg)](https://gitlab.com/srz-zumix/iutest-test/commits/develop)|Google Test/Google Mock compatibility (HEAD)|
129130 |[Peakflow](https://www.peakflow.io)|[![Peakflow Build Status](https://www.peakflow.io/en/projects/iutest/branch-statuses/master.svg)](https://www.peakflow.io/en/projects/iutest/build-groups?build_groups_q%5Bbranch_name_cont%5D=master)|[![Peakflow Build Status](https://www.peakflow.io/en/projects/iutest/branch-statuses/develop.svg)](https://www.peakflow.io/en/projects/iutest/build-groups?build_groups_q%5Bbranch_name_cont%5D=develop)||
130131 |[Scrutinizer](https://scrutinizer-ci.com/)|[![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|
131132 |[Semaphore](https://semaphoreci.com/)|[![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|
132133 |[Semaphore 2.0](https://semaphoreci.com/)|[![Semaphore 2.0 Build Status](https://srz-zumix.semaphoreci.com/badges/iutest/branches/master.svg)](https://srz-zumix.semaphoreci.com/projects/iutest)|[![Semaphore 2.0 Build Status](https://srz-zumix.semaphoreci.com/badges/iutest/branches/develop.svg)](https://srz-zumix.semaphoreci.com/projects/iutest)|Scan-build, Basic test, sample run|
133-|[Shippable](http://shippable.com/)|[![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)|
134+|[Shippable](https://shippable.com/)|[![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)|
134135 |[Travis CI](https://travis-ci.com/)|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=develop)](https://travis-ci.com/srz-zumix/iutest)|Basic tests, Google Test compatibility, Coverage, Coverity-scan|
135-|[Wercker](http://www.wercker.com/)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/master "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/develop "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|Syntax tests for compiler each version (c++latest)|
136+|[Wercker](https://www.wercker.com/)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/master "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|[![wercker status](https://app.wercker.com/status/d385156052aa4118a7f24affe4a8f851/s/develop "wercker status")](https://app.wercker.com/project/byKey/d385156052aa4118a7f24affe4a8f851)|Syntax tests for compiler each version (c++latest)|
136137
137138 Basic test
138139
--- trunk/appveyor.yml (revision 1407)
+++ trunk/appveyor.yml (revision 1408)
@@ -100,8 +100,11 @@
100100 - buddy.yml
101101 - .circleci/*
102102 - .cirrus.yml
103+ - .scrutinizer.yml
103104 - codecov.yml
104105 - codefresh.yml
106+ - codeship-services.yml
107+ - codeship-steps.yml
105108 - .drone.yml
106109 - .github/*
107110 - .semaphore/*
--- trunk/azure-pipelines.yml (revision 1407)
+++ trunk/azure-pipelines.yml (revision 1408)
@@ -6,6 +6,8 @@
66 - develop
77 - azure-pipelines/*
88 - azurepipelines/*
9+ - feature/*
10+ - fix/*
911 paths:
1012 exclude:
1113 - "*.md"
@@ -21,8 +23,11 @@
2123 - buddy.yml
2224 - .circleci/*
2325 - .cirrus.yml
26+ - .scrutinizer.yml
2427 - codecov.yml
2528 - codefresh.yml
29+ - codeship-services.yml
30+ - codeship-steps.yml
2631 - .drone.yml
2732 - .github/*
2833 - .semaphore/*
@@ -36,8 +41,6 @@
3641 include:
3742 - master
3843 - develop
39- - feature/*
40- - fix/*
4144
4245 stages:
4346 - stage: Precheck
--- trunk/codefresh.yml (revision 1407)
+++ trunk/codefresh.yml (revision 1408)
@@ -24,7 +24,7 @@
2424 title: Building Docker Image
2525 stage: build
2626 type: build
27- image_name: srz-zumix/iutest
27+ image_name: srzzumix/iutest_dev_env
2828 working_directory: ./
2929 tag: '${{CF_BRANCH_TAG_NORMALIZED}}'
3030 dockerfile: ./tools/docker/Dockerfile
--- trunk/codeship-services.yml (nonexistent)
+++ trunk/codeship-services.yml (revision 1408)
@@ -0,0 +1,8 @@
1+iutest:
2+ build:
3+ image: codeship/iutest
4+ dockerfile: ./tools/docker/Dockerfile
5+ volumes:
6+ - ./.ssh:/root/.ssh
7+ - ./:/work
8+ cached: true
--- trunk/codeship-steps.yml (nonexistent)
+++ trunk/codeship-steps.yml (revision 1408)
@@ -0,0 +1,44 @@
1+# iutest using codeship basic
2+# this file is codeship settings sample
3+- type: parallel
4+ exclude: gh-pages
5+ steps:
6+ - name: cpplint
7+ service: iutest
8+ command: make -C /work/test/cpplint
9+ - name: check-include-guard
10+ service: iutest
11+ command: make -C /work/test check_incg
12+ - name: check-documents
13+ service: iutest
14+ command: make -C /work/test/docs version-test doxygen-test
15+ - name: editorconfig-self-lint
16+ service: iutest
17+ command: make -C /work editorconfig-self-lint
18+ - name: check-fullpath
19+ service: iutest
20+ command: make -C /work/test/repository check-fullpath
21+ - name: check-crlf
22+ service: iutest
23+ command: /work/.ci/check-crlf.sh
24+
25+- type: parallel
26+ exclude: gh-pages
27+ steps:
28+ - name: check-remote-crlf
29+ service: iutest
30+ command: make -C /work/test/repository check-remote-crlf
31+
32+- type: parallel
33+ tag: master
34+ steps:
35+ - name: sync-svn
36+ service: iutest
37+ command: /work/.ci/sync-svn.sh
38+
39+- type: parallel
40+ tag: v.*
41+ steps:
42+ - name: sync-svn
43+ service: iutest
44+ command: /work/.ci/sync-svn-tag.sh
--- trunk/docs/Makefile (revision 1407)
+++ trunk/docs/Makefile (revision 1408)
@@ -2,6 +2,7 @@
22
33 LANG=ja_JP.SJIS
44 HTMLLINT_PATH=$(subst \,/, $(HTMLLINT_ROOT))
5+GHPAGES_DIR:=gh-pages
56
67 default: target
78
@@ -19,15 +20,18 @@
1920 # cp '$(DOXYGEN_ROOT)/bin/doxysearch.cgi' html/
2021
2122 gh-pages: target
22- - mkdir gh-pages
23- cp *.html gh-pages/
24- cp -r css gh-pages/
25- cp -r html gh-pages/
26- cp -r images gh-pages/
27- cp ../README.md gh-pages/
28- cp -r dev/.circleci gh-pages/
29- cp dev/*.yml gh-pages/
23+ - mkdir ${GHPAGES_DIR}
24+ cp *.html ${GHPAGES_DIR}/
25+ cp -r css ${GHPAGES_DIR}/
26+ cp -r html ${GHPAGES_DIR}/
27+ cp -r images ${GHPAGES_DIR}/
28+ cp ../README.md ${GHPAGES_DIR}/
3029
30+gh-pages-for-master:
31+ cp -r dev/.circleci ${GHPAGES_DIR}/
32+ cp dev/*.yml ${GHPAGES_DIR}/
33+ cp ../README.md ${GHPAGES_DIR}/
34+
3135 clean:
3236 rm -rf html
3337 rm -rf gh-pages
--- trunk/docs/cover.html (revision 1407)
+++ trunk/docs/cover.html (revision 1408)
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+<html xmlns="https://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
55 <head>
66 <title>iutest</title>
77 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -8,12 +8,12 @@
88 <meta http-equiv="content-style-type" content="text/css" />
99 <meta http-equiv="content-script-type" content="text/javascript" />
1010
11- <link href="http://alexgorbatchev.com/pub/sh/current/styles/shCore.css" rel="stylesheet" type="text/css" />
12- <link href="http://alexgorbatchev.com/pub/sh/current/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
11+ <link href="https://alexgorbatchev.com/pub/sh/current/styles/shCore.css" rel="stylesheet" type="text/css" />
12+ <link href="https://alexgorbatchev.com/pub/sh/current/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
1313 <link href="css/doc.css" rel="stylesheet" type="text/css" />
1414
15- <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shCore.js" type="text/javascript"></script>
16- <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shBrushCpp.js" type="text/javascript"></script>
15+ <script src="https://alexgorbatchev.com/pub/sh/current/scripts/shCore.js" type="text/javascript"></script>
16+ <script src="https://alexgorbatchev.com/pub/sh/current/scripts/shBrushCpp.js" type="text/javascript"></script>
1717 <script type="text/javascript">
1818 SyntaxHighlighter.all();
1919 </script>
@@ -91,7 +91,7 @@
9191 <div class="contents">
9292 <h1>LICENSE</h1>
9393 <div class="text_block">
94-This software is released under the <a href="http://opensource.org/licenses/BSD-3-Clause">New(3-clause) BSD License</a>.<br />
94+This software is released under the <a href="https://opensource.org/licenses/BSD-3-Clause">New(3-clause) BSD License</a>.<br />
9595
9696 <pre>
9797 BSD 3-Clause License
--- trunk/docs/dev/rocro.yml (revision 1407)
+++ trunk/docs/dev/rocro.yml (nonexistent)
@@ -1,9 +0,0 @@
1-# for gh-pages
2-inspecode:
3- tidy:
4- #auto-fix: true
5- ignore:
6- - html/*
7- options:
8- --indent: y
9- -wrap: 0
--- trunk/docs/dev/peak_flow.yml (nonexistent)
+++ trunk/docs/dev/peak_flow.yml (revision 1408)
@@ -0,0 +1,2 @@
1+script:
2+ - echo ok
--- trunk/docs/index.html (revision 1407)
+++ trunk/docs/index.html (revision 1408)
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+<html xmlns="https://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
55 <head>
66 <title>iutest</title>
77 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
--- trunk/docs/primer.html (revision 1407)
+++ trunk/docs/primer.html (revision 1408)
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+<html xmlns="https://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
55 <head>
66 <title>iutest - 入門</title>
77 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -8,12 +8,12 @@
88 <meta http-equiv="content-style-type" content="text/css" />
99 <meta http-equiv="content-script-type" content="text/javascript" />
1010
11- <link href="http://alexgorbatchev.com/pub/sh/current/styles/shCore.css" rel="stylesheet" type="text/css" />
12- <link href="http://alexgorbatchev.com/pub/sh/current/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
11+ <link href="https://alexgorbatchev.com/pub/sh/current/styles/shCore.css" rel="stylesheet" type="text/css" />
12+ <link href="https://alexgorbatchev.com/pub/sh/current/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
1313 <link href="css/doc.css" rel="stylesheet" type="text/css" />
1414
15- <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shCore.js" type="text/javascript"></script>
16- <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shBrushCpp.js" type="text/javascript"></script>
15+ <script src="https://alexgorbatchev.com/pub/sh/current/scripts/shCore.js" type="text/javascript"></script>
16+ <script src="https://alexgorbatchev.com/pub/sh/current/scripts/shBrushCpp.js" type="text/javascript"></script>
1717 <script type="text/javascript">
1818 SyntaxHighlighter.all();
1919 </script>
--- trunk/docs/sidebar.html (revision 1407)
+++ trunk/docs/sidebar.html (revision 1408)
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+<html xmlns="https://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
55 <head>
66 <title>サイドバー</title>
77 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
--- trunk/docs/twilio.html (revision 1407)
+++ trunk/docs/twilio.html (revision 1408)
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+<html xmlns="https://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
55 <head>
66 <title>iutest - Twilio</title>
77 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -16,7 +16,7 @@
1616
1717 <h2>iutwilio</h2>
1818 <div class="text_block">
19-<a href="http://twilio.kddi-web.com/">Twilio</a> を利用しテスト結果を電話やSMSで通知できます。<br />
19+<a href="https://twilio.kddi-web.com/">Twilio</a> を利用しテスト結果を電話やSMSで通知できます。<br />
2020 </div>
2121
2222 <h2>使い方</h2>
--- trunk/docs/wandbox.html (revision 1407)
+++ trunk/docs/wandbox.html (revision 1408)
@@ -1,7 +1,7 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+<html xmlns="https://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
55 <head>
66 <title>iutest - Wandbox</title>
77 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -16,7 +16,7 @@
1616
1717 <h2>iuwandbox</h2>
1818 <div class="text_block">
19-<a href="http://melpon.org/wandbox/">Wandbox</a> で iutest を使ったテストコードを書けるように対応しました。<br />
19+<a href="https://melpon.org/wandbox/">Wandbox</a> で iutest を使ったテストコードを書けるように対応しました。<br />
2020 様々なコンパイラー・バージョンでビルド・テストができるため、あなたのプログラムのコンパイラー対応を助けます。<br />
2121 </div>
2222
@@ -55,7 +55,7 @@
5555
5656 サンプルの実行結果はこちらになります。<br />
5757 <img src="./images/iuwandbox_sample.png" alt="サンプル実行結果" />
58-<a href="http://melpon.org/wandbox/permlink/VspJQN4s3NzUR3C9" target="_blank">http://melpon.org/wandbox/permlink/VspJQN4s3NzUR3C9</a><br />
58+<a href="https://melpon.org/wandbox/permlink/VspJQN4s3NzUR3C9" target="_blank">https://melpon.org/wandbox/permlink/VspJQN4s3NzUR3C9</a><br />
5959 <br />
6060 コンパイラーの選択などは後述のコマンドラインオプションの項をご覧ください。<br />
6161 </div>
@@ -72,7 +72,7 @@
7272 <tr><td> </td><td>--cpp-verbose </td><td>Wandbox の Verbose を有効にします。</td></tr>
7373 <tr><td> </td><td>--optimize </td><td>Wandbox の Optimization を有効します。</td></tr>
7474 <tr><td> </td><td>--sprout </td><td><a href="https://github.com/bolero-MURAKAMI/Sprout">Sprout</a> を使用します。</td></tr>
75-<tr><td> </td><td>--msgpack </td><td><a href="http://msgpack.org/">MessagePack</a> を使用します。</td></tr>
75+<tr><td> </td><td>--msgpack </td><td><a href="https://msgpack.org/">MessagePack</a> を使用します。</td></tr>
7676 <tr><td>-f</td><td>--compiler-options-raw OPTIONS</td><td>コンパイラーのオプションを直接指定します。複数のオプションを指定する場合は、[ -f"-Dx=hogefuga -O3" ] とするか、[ -f"-Dx=hogefuga" -f"-O3" ] のように記述できます。 </td></tr>
7777 <tr><td>-r</td><td>--runtime-options-raw OPTIONS</td><td>ビルドした実行ファイルのコマンドラインオプションを指定します。複数のオプションを指定する場合は、[ -r"--iutest_shuffle --iutest_random_seed=1" ] とするか、[ -r"--iutest_shuffle" -r"--iutest_random_seed=1" ] のように複数オプションを記述してください。 </td></tr>
7878 <tr><td> </td><td>--iutest-use-main </td><td>-DIUTEST_USE_MAIN をコンパイルオプションにつけます。main 関数の記述が省略できます。</td></tr>
--- trunk/include/internal/iutest_compiler.hpp (revision 1407)
+++ trunk/include/internal/iutest_compiler.hpp (revision 1408)
@@ -455,7 +455,7 @@
455455 # define IUTEST_HAS_VARIADIC_TEMPLATES 1
456456 # endif
457457 # elif defined(__GNUC__)
458-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35722
458+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=35722
459459 # if defined(__VARIADIC_TEMPLATES) \
460460 || ( ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) && defined(__GXX_EXPERIMENTAL_CXX0X__) )
461461 # define IUTEST_HAS_VARIADIC_TEMPLATES 1
@@ -1397,7 +1397,7 @@
13971397 */
13981398
13991399 #if defined(_MSC_VER)
1400-// http://stackoverflow.com/questions/14487241/avoiding-an-inheritance-by-dominance-warning-for-a-mocked-stdfstream-class
1400+// https://stackoverflow.com/questions/14487241/avoiding-an-inheritance-by-dominance-warning-for-a-mocked-stdfstream-class
14011401 # define IUTEST_WORKAROUND_MSC_STLSTREAM_C4250() \
14021402 void _Add_vtordisp1() {} \
14031403 void _Add_vtordisp2() {}
--- trunk/include/internal/iutest_core_impl.hpp (revision 1407)
+++ trunk/include/internal/iutest_core_impl.hpp (revision 1408)
@@ -209,7 +209,7 @@
209209 #if IUTEST_HAS_RTTI
210210 ::std::string name = MakeIndexTestName(basename, index);
211211 name += "/";
212- name += GetTypeName<T>();
212+ name += GetTypeNameProxy<T>::GetTypeNameProxy();
213213 return name;
214214 #else
215215 return MakeIndexTestName(basename, index);
--- trunk/include/internal/iutest_file.hpp (revision 1407)
+++ trunk/include/internal/iutest_file.hpp (revision 1408)
@@ -204,6 +204,10 @@
204204 {
205205 return false;
206206 }
207+ if( fflush(m_fp) != 0 )
208+ {
209+ return false;
210+ }
207211 return true;
208212 }
209213
--- trunk/include/internal/iutest_genparams.hpp (revision 1407)
+++ trunk/include/internal/iutest_genparams.hpp (revision 1408)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -271,7 +271,7 @@
271271
272272 #if defined(__clang__) && defined(IUTEST_LIBSTDCXX_VERSION) && IUTEST_LIBSTDCXX_VERSION >= 40900
273273 #if IUTEST_HAS_RVALUE_REFS
274- // http://stackoverflow.com/questions/23374953/why-does-this-exceed-the-maximum-recursive-template-depth
274+ // https://stackoverflow.com/questions/23374953/why-does-this-exceed-the-maximum-recursive-template-depth
275275 iuValueArray(const iuValueArray& rhs)
276276 : v(rhs.v) {}
277277 iuValueArray(iuValueArray&& rhs)
--- trunk/include/internal/iutest_internal_defs.hpp (revision 1407)
+++ trunk/include/internal/iutest_internal_defs.hpp (revision 1408)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -73,7 +73,7 @@
7373 # define IUTEST_BREAK() DebugBreak()
7474 # endif
7575 # elif defined(IUTEST_OS_MAC)
76-// http://www.cocoawithlove.com/2008/03/break-into-debugger.html
76+// https://www.cocoawithlove.com/2008/03/break-into-debugger.html
7777 # if defined(__ppc64__) || defined(__ppc__)
7878 # define IUTEST_BREAK() __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" : : : "memory", "r0", "r3", "r4" )
7979 # else
@@ -362,6 +362,15 @@
362362
363363 #endif
364364
365+/**
366+ * @brief 型名の取得
367+*/
368+template<typename T>
369+struct GetTypeNameProxy
370+{
371+ static ::std::string GetTypeName() { return detail::GetTypeName<T>(); }
372+};
373+
365374 } // end of namespace detail
366375 } // end of namespace iutest
367376
--- trunk/include/internal/iutest_stdlib.hpp (revision 1407)
+++ trunk/include/internal/iutest_stdlib.hpp (revision 1408)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -80,51 +80,54 @@
8080 #if IUTEST_HAS_CXX11
8181 # if IUTEST_LIBSTDCXX_VERSION >= 60100
8282 # if !defined(IUTEST_HAS_STD_INVOKE) && IUTEST_HAS_CXX1Z
83-# define IUTEST_HAS_STD_INVOKE 1
83+# define IUTEST_HAS_STD_INVOKE 1
8484 # endif
8585 # endif
8686 # if IUTEST_LIBSTDCXX_VERSION >= 50100
8787 # if !defined(IUTEST_HAS_CXX_HDR_CODECVT)
88-# define IUTEST_HAS_CXX_HDR_CODECVT 1
88+# define IUTEST_HAS_CXX_HDR_CODECVT 1
8989 # endif
9090 # endif
9191 # if IUTEST_LIBSTDCXX_VERSION >= 40900
9292 # if !defined(IUTEST_HAS_CXX_HDR_REGEX)
93-# define IUTEST_HAS_CXX_HDR_REGEX 1
93+# define IUTEST_HAS_CXX_HDR_REGEX 1
9494 # endif
9595 # endif
9696 # if IUTEST_LIBSTDCXX_VERSION >= 40700
9797 # if !defined(IUTEST_HAS_STD_EMPLACE)
98-# define IUTEST_HAS_STD_EMPLACE 1
98+# define IUTEST_HAS_STD_EMPLACE 1
9999 # endif
100100 # if !defined(IUTEST_HAS_CXX_HDR_CHRONO)
101-# define IUTEST_HAS_CXX_HDR_CHRONO 1
101+# define IUTEST_HAS_CXX_HDR_CHRONO 1
102102 # endif
103103 # endif
104104 # if IUTEST_LIBSTDCXX_VERSION >= 40600
105105 # if !defined(IUTEST_HAS_STD_BEGIN_END)
106-# define IUTEST_HAS_STD_BEGIN_END 1
106+# define IUTEST_HAS_STD_BEGIN_END 1
107107 # endif
108108 # endif
109109 # if IUTEST_LIBSTDCXX_VERSION >= 40500
110110 # if !defined(IUTEST_HAS_STD_DECLVAL)
111-# define IUTEST_HAS_STD_DECLVAL 1
111+# define IUTEST_HAS_STD_DECLVAL 1
112112 # endif
113113 # if !defined(IUTEST_HAS_CXX_HDR_RANDOM)
114-# define IUTEST_HAS_CXX_HDR_RANDOM 1
114+# define IUTEST_HAS_CXX_HDR_RANDOM 1
115115 # endif
116116 # if !defined(IUTEST_HAS_CXX_HDR_CSTDINT)
117-# define IUTEST_HAS_CXX_HDR_CSTDINT 1
117+# define IUTEST_HAS_CXX_HDR_CSTDINT 1
118118 # endif
119119 # endif
120120 # if IUTEST_LIBSTDCXX_VERSION >= 40300
121121 # if !defined(IUTEST_HAS_CXX_HDR_ARRAY)
122-# define IUTEST_HAS_CXX_HDR_ARRAY 1
122+# define IUTEST_HAS_CXX_HDR_ARRAY 1
123123 # endif
124+# if !defined(IUTEST_HAS_STD_TUPLE)
125+# define IUTEST_HAS_STD_TUPLE 1
126+# endif
124127 # endif
125128 # if defined(_GLIBCXX_HAVE_QUICK_EXIT) && defined(_GLIBCXX_HAVE_AT_QUICK_EXIT)
126129 # if !defined(IUTEST_HAS_STD_QUICK_EXIT)
127-# define IUTEST_HAS_STD_QUICK_EXIT 1
130+# define IUTEST_HAS_STD_QUICK_EXIT 1
128131 # endif
129132 # endif
130133 # if defined(__has_include)
@@ -136,24 +139,21 @@
136139 # endif
137140 #endif
138141
139-// tuple
140-#if IUTEST_HAS_VARIADIC_TEMPLATES
141-# if !defined(IUTEST_HAS_STD_TUPLE)
142-# define IUTEST_HAS_STD_TUPLE 1
142+#if !defined(IUTEST_HAS_STD_TUPLE)
143+# if (!defined(__CUDACC__) && !defined(__ARMCC_VERSION) && (IUTEST_LIBSTDCXX_VERSION >= 40000))
144+# if !defined(IUTEST_HAS_TR1_TUPLE)
145+# define IUTEST_HAS_TR1_TUPLE 1
146+# endif
143147 # endif
144-#elif (!defined(__CUDACC__) && !defined(__ARMCC_VERSION) && (IUTEST_LIBSTDCXX_VERSION >= 40000))
145-# if !defined(IUTEST_HAS_TR1_TUPLE)
146-# define IUTEST_HAS_TR1_TUPLE 1
147-# endif
148148 #endif
149149
150150 #if !defined(IUTEST_HAS_HDR_CXXABI)
151151 # if defined(__has_include)
152152 # if __has_include( <cxxabi.h> )
153-# define IUTEST_HAS_HDR_CXXABI 1
153+# define IUTEST_HAS_HDR_CXXABI 1
154154 # endif
155155 # else
156-# define IUTEST_HAS_HDR_CXXABI 1
156+# define IUTEST_HAS_HDR_CXXABI 1
157157 # endif
158158 #endif
159159
@@ -202,6 +202,9 @@
202202 # if !defined(IUTEST_HAS_CXX_HDR_CUCHAR) && __has_include( <cuchar> )
203203 # define IUTEST_HAS_CXX_HDR_CUCHAR 1
204204 # endif
205+# if !defined(IUTEST_HAS_STD_TUPLE) && __has_include( <tuple> )
206+# define IUTEST_HAS_STD_TUPLE 1
207+# endif
205208 # endif
206209 #endif
207210
@@ -219,20 +222,12 @@
219222 # endif
220223 #endif
221224
222-// tuple
223-#if IUTEST_HAS_VARIADIC_TEMPLATES
224-# if !defined(IUTEST_HAS_STD_TUPLE)
225-# define IUTEST_HAS_STD_TUPLE 1
225+#if defined(__has_include)
226+# if !defined(IUTEST_HAS_STD_TUPLE) && !defined(IUTEST_HAS_TR1_TUPLE) && __has_include( <tr1/tuple> )
227+# define IUTEST_HAS_TR1_TUPLE 1
226228 # endif
227-#elif defined(__has_include)
228-# if !defined(IUTEST_HAS_TR1_TUPLE) && __has_include( <tr1/tuple> )
229-# define IUTEST_HAS_TR1_TUPLE 1
230-# endif
231-#endif
232-
233-#if defined(__has_include)
234229 # if !defined(IUTEST_HAS_HDR_CXXABI) && __has_include( <cxxabi.h> )
235-# define IUTEST_HAS_HDR_CXXABI 1
230+# define IUTEST_HAS_HDR_CXXABI 1
236231 # endif
237232 #endif
238233
@@ -399,7 +394,7 @@
399394 #endif
400395 /**
401396 * @brief has codecvt header
402- * @note P0618R0 Deprecating <codecvt>: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0618r0.html
397+ * @note P0618R0 Deprecating <codecvt>: https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0618r0.html
403398 * @deprecated
404399 */
405400 #if !defined(IUTEST_HAS_CXX_HDR_CODECVT)
@@ -809,6 +804,16 @@
809804 # define IUPRzu "zu"
810805 #endif
811806
807+#if !defined(iu_va_copy)
808+# if defined(va_copy)
809+# define iu_va_copy va_copy
810+# elif defined(__GNUC__) || defined(__clang__)
811+# define iu_va_copy(dest, src) __builtin_va_copy(dest, src)
812+# else
813+# define iu_va_copy(dest, src) (dest = src)
814+# endif
815+#endif
816+
812817 namespace iutest {
813818 namespace detail
814819 {
--- trunk/include/internal/iutest_stream.hpp (revision 1407)
+++ trunk/include/internal/iutest_stream.hpp (revision 1408)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -15,6 +15,8 @@
1515 #ifndef INCG_IRIS_IUTEST_STREAM_HPP_3A4AF139_9F24_4730_81D0_DADFCE6DCF99_
1616 #define INCG_IRIS_IUTEST_STREAM_HPP_3A4AF139_9F24_4730_81D0_DADFCE6DCF99_
1717
18+#include "iutest_string.hpp"
19+
1820 namespace iutest {
1921 namespace detail
2022 {
@@ -34,26 +36,13 @@
3436 public:
3537 virtual int Printf(const char* fmt, ...) IUTEST_ATTRIBUTE_FORMAT_PRINTF(2, 3)
3638 {
37-IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
38-
39- // TODO : Fixed buffer...
40- char buf[1024] = {0};
4139 va_list va;
4240 va_start(va, fmt);
43- const int len = iu_vsnprintf(buf, sizeof(buf)-1, fmt, va);
41+ const ::std::string str = StringFormat(fmt, va);
4442 va_end(va);
45-
46- if( len > 0 )
47- {
48- Write(buf, static_cast<size_t>(len), 1);
49- }
50- else
51- {
52- IUTEST_LOG_(WARNING) << "stream output trancated: " << fmt;
53- }
54- return len;
55-
56-IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
43+ const size_t len = str.length();
44+ Write(str.c_str(), len, 1);
45+ return static_cast<int>(len);
5746 }
5847 };
5948
--- trunk/include/internal/iutest_string.hpp (revision 1407)
+++ trunk/include/internal/iutest_string.hpp (revision 1408)
@@ -2,11 +2,11 @@
22 //-----------------------------------------------------------------------
33 /**
44 * @file iutest_string.hpp
5- * @brief iris unit test 文字列操作 ファイル
5+ * @brief iris unit test string utilities
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -47,6 +47,7 @@
4747 {
4848
4949 ::std::string StringFormat(const char* format, ...) IUTEST_ATTRIBUTE_FORMAT_PRINTF(1, 2);
50+::std::string StringFormat(const char* format, va_list va) IUTEST_ATTRIBUTE_FORMAT_PRINTF(1, 0);
5051
5152 namespace wrapper
5253 {
@@ -143,13 +144,16 @@
143144
144145 inline int iu_vsnprintf(char* dst, size_t size, const char* format, va_list va)
145146 {
146- char buffer[4096];
147- const int ret = vsprintf(buffer, format, va);
147+ char buffer[4096] = {0};
148+ char* write_buffer = dst != NULL && size >= 4096 ? dst : buffer;
149+ const int ret = vsprintf(write_buffer, format, va);
148150 if( dst != NULL )
149151 {
150152 const size_t length = static_cast<size_t>(ret);
151153 const size_t write = (size <= length) ? size - 1 : length;
152- strncpy(dst, buffer, write);
154+ if( write_buffer == buffer ) {
155+ strncpy(dst, buffer, write);
156+ }
153157 dst[write] = '\0';
154158 }
155159 return ret;
@@ -451,12 +455,20 @@
451455
452456 inline ::std::string StringFormat(const char* format, ...)
453457 {
458+ va_list va;
459+ va_start(va, format);
460+ ::std::string str = StringFormat(format, va);
461+ va_end(va);
462+ return str;
463+}
464+inline ::std::string StringFormat(const char* format, va_list va)
465+{
454466 size_t n = strlen(format) * 2 + 1;
455467 {
456- va_list va;
457- va_start(va, format);
458- const size_t ret = iu_vsnprintf(NULL, 0, format, va);
459- va_end(va);
468+ va_list va2;
469+ iu_va_copy(va2, va); // cppcheck-suppress va_list_usedBeforeStarted
470+ const size_t ret = iu_vsnprintf(NULL, 0, format, va2);
471+ va_end(va2);
460472 if( ret > 0 )
461473 {
462474 n = ret + 1;
@@ -465,10 +477,10 @@
465477 for( ;; )
466478 {
467479 char* dst = new char[n];
468- va_list va;
469- va_start(va, format);
470- const int written = iu_vsnprintf(dst, n, format, va);
471- va_end(va);
480+ va_list va2;
481+ iu_va_copy(va2, va); // cppcheck-suppress va_list_usedBeforeStarted
482+ const int written = iu_vsnprintf(dst, n, format, va2);
483+ va_end(va2);
472484 if( written < 0 )
473485 {
474486 #if defined(EOVERFLOW)
--- trunk/include/internal/iutest_typed_util.hpp (revision 1407)
+++ trunk/include/internal/iutest_typed_util.hpp (revision 1408)
@@ -54,16 +54,35 @@
5454
5555 #undef IIUT_DECL_DEFAULT_ARG_
5656
57+#define IIUT_DECL_TYPES_CONCATTYPENAME_(i, param) GetTypeNameProxy<IUTEST_PP_CAT(param, i)>::GetTypeName() + ", " +
58+#define IIUT_DECL_TYPES_GETTYPENAME_I_(n, m) \
59+ template<IUTEST_PP_ENUM_PARAMS(n, typename T)>struct \
60+ GetTypeNameProxy<Types< IUTEST_PP_ENUM_PARAMS(n, T) \
61+ , IUTEST_PP_ENUM(m, IIUT_DECL_SPEC_NONE_, detail::None)> > { \
62+ static ::std::string GetTypeName() { \
63+ ::std::string name = "iutest::Types<"; \
64+ name += IUTEST_PP_REPEAT(IUTEST_PP_DEC(n), IIUT_DECL_TYPES_CONCATTYPENAME_, T) \
65+ GetTypeNameProxy<IUTEST_PP_CAT(T, IUTEST_PP_DEC(n))>::GetTypeName() + ">"; \
66+ return name; \
67+ } \
68+ }
69+#define IIUT_DECL_TYPES_GETTYPENAME_(n, m) \
70+ namespace detail { \
71+ IIUT_DECL_TYPES_GETTYPENAME_I_(n, m); \
72+ }
73+
5774 #define IIUT_DECL_SPEC_NONE_(i, param) param
58-#define IIUT_DECL_TYPES_(n, m) \
59- template< IUTEST_PP_ENUM_PARAMS(n, typename T) > \
60- struct Types< IUTEST_PP_ENUM_PARAMS(n, T) \
75+#define IIUT_DECL_TYPES_(n, m) \
76+ IIUT_DECL_TYPES_GETTYPENAME_(n, m) \
77+ template< IUTEST_PP_ENUM_PARAMS(n, typename T) > \
78+ struct Types< IUTEST_PP_ENUM_PARAMS(n, T) \
6179 , IUTEST_PP_ENUM(m, IIUT_DECL_SPEC_NONE_, detail::None) > { \
62- typedef IUTEST_PP_CAT(detail::TypeList, n)< \
63- IUTEST_PP_ENUM_PARAMS(n, T) > type; \
80+ typedef IUTEST_PP_CAT(detail::TypeList, n)< \
81+ IUTEST_PP_ENUM_PARAMS(n, T) > type; \
6482 template<size_t N>struct get : public detail::typelist_get<type, N> {}; \
6583 }
6684
85+
6786 template<>
6887 struct Types< IUTEST_PP_ENUM(50, IIUT_DECL_SPEC_NONE_, detail::None) >
6988 {
@@ -120,6 +139,9 @@
120139 IIUT_DECL_TYPES_(48, 2);
121140 IIUT_DECL_TYPES_(49, 1);
122141
142+#undef IIUT_DECL_TYPES_CONCATTYPENAME_
143+#undef IIUT_DECL_TYPES_GETTYPENAME_I_
144+#undef IIUT_DECL_TYPES_GETTYPENAME_
123145 #undef IIUT_DECL_SPEC_NONE_
124146 #undef IIUT_DECL_TYPES_
125147
--- trunk/include/iutest_case.hpp (revision 1407)
+++ trunk/include/iutest_case.hpp (revision 1408)
@@ -279,7 +279,7 @@
279279 */
280280 TypedTestCase(const ::std::string& testcase_name, TestTypeId id, SetUpMethod setup, TearDownMethod teardown)
281281 : TestCase(testcase_name, id, setup, teardown)
282- , m_type_param(detail::GetTypeName<TypeParam>())
282+ , m_type_param(detail::GetTypeNameProxy<TypeParam>::GetTypeName())
283283 {
284284 }
285285
--- trunk/include/iutest_config.hpp (revision 1407)
+++ trunk/include/iutest_config.hpp (revision 1408)
@@ -227,7 +227,7 @@
227227
228228 #if !defined(IUTEST_HAS_VARIADIC_COMBINE)
229229 //! 可変長引数に対応した ::iutest::Combine が使用可能かどうか
230-# if IUTEST_HAS_COMBINE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_TUPLE
230+# if IUTEST_HAS_COMBINE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_STD_TUPLE
231231 # define IUTEST_HAS_VARIADIC_COMBINE 1
232232 # else
233233 # define IUTEST_HAS_VARIADIC_COMBINE 0
@@ -236,7 +236,7 @@
236236
237237 #if !defined(IUTEST_HAS_VARIADIC_PAIRWISE)
238238 //! 可変長引数に対応した ::iutest::Pairwise が使用可能かどうか
239-# if IUTEST_HAS_PAIRWISE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_TUPLE
239+# if IUTEST_HAS_PAIRWISE && IUTEST_HAS_VARIADIC_TEMPLATES && IUTEST_HAS_STD_TUPLE
240240 # define IUTEST_HAS_VARIADIC_PAIRWISE 1
241241 # else
242242 # define IUTEST_HAS_VARIADIC_PAIRWISE 0
--- trunk/include/iutest_defs.hpp (revision 1407)
+++ trunk/include/iutest_defs.hpp (revision 1408)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
9+ * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -208,7 +208,7 @@
208208
209209 /**
210210 * @brief 浮動小数点数がほぼ一致するかどうか
211- * @sa http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
211+ * @sa https://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
212212 */
213213 bool NanSensitiveAlmostEquals(const _Myt& rhs) const
214214 {
--- trunk/include/iutest_matcher.hpp (revision 1407)
+++ trunk/include/iutest_matcher.hpp (revision 1408)
@@ -1195,7 +1195,7 @@
11951195 {
11961196 iu_global_format_stringstream strm;
11971197 strm << "Field: " << m_expected;
1198- //strm << "Field: (" << detail::GetTypeName<F>() << ") " << m_expected;
1198+ //strm << "Field: (" << detail::GetTypeNameProxy<F>::GetTypeName() << ") " << m_expected;
11991199 return strm.str();
12001200 }
12011201 private:
@@ -1250,7 +1250,7 @@
12501250 {
12511251 iu_global_format_stringstream strm;
12521252 strm << "Property: " << m_expected;
1253- //strm << "Property: (" << detail::GetTypeName<F>() << ") " << m_expected;
1253+ //strm << "Property: (" << detail::GetTypeNameProxy<F>::GetTypeName() << ") " << m_expected;
12541254 return strm.str();
12551255 }
12561256 private:
@@ -1380,7 +1380,7 @@
13801380 {
13811381 iu_global_format_stringstream strm;
13821382 strm << "Result of: " << m_expected;
1383- //strm << "Result of " << detail::GetTypeName<F>() << "(): " << m_expected;
1383+ //strm << "Result of " << detail::GetTypeNameProxy<F>::GetTypeName() << "(): " << m_expected;
13841384 return strm.str();
13851385 }
13861386 private:
@@ -1481,7 +1481,7 @@
14811481 ::std::string WhichIs() const IUTEST_CXX_OVERRIDE
14821482 {
14831483 iu_global_format_stringstream strm;
1484- strm << "A: " << detail::GetTypeName<T>();
1484+ strm << "A: " << detail::GetTypeNameProxy<T>::GetTypeName();
14851485 return strm.str();
14861486 }
14871487 };
--- trunk/include/iutest_ver.hpp (revision 1407)
+++ trunk/include/iutest_ver.hpp (revision 1408)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01170005u //!< iutest version 1.17.0.5
20+#define IUTEST_VER 0x01170007u //!< iutest version 1.17.0.7
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x17u //!< Minor Version
2323 #define IUTEST_MICROVER 0x00u //!< Micro Version
24-#define IUTEST_REVISION 0x05u //!< Revision
24+#define IUTEST_REVISION 0x07u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -28,7 +28,7 @@
2828 /**
2929 * @mainpage
3030 * @sa @b ProjectHome \n
31- * OSDN : http://osdn.jp/projects/iutest/ \n
31+ * OSDN : https://osdn.jp/projects/iutest/ \n
3232 * github : https://github.com/srz-zumix/iutest \n
3333 * google group: https://groups.google.com/forum/?fromgroups#!forum/g-iutest \n
3434 *
@@ -65,7 +65,7 @@
6565 */
6666
6767 /**
68- * @page CMDLINE コマンドラインオプション
68+ * @page cmdline コマンドラインオプション
6969 * @par Command Line Options
7070 <table>
7171 <tr><td>--help, -h </td><td></td><td>Generate help message.</td></tr>
@@ -96,7 +96,7 @@
9696 */
9797
9898 /**
99- * @page ENVIRONMENT_OPTIONS 環境変数オプション
99+ * @page environmentoptions 環境変数オプション
100100 * @par Environment variable Options
101101 <table>
102102 <tr><td>IUTEST_OUTPUT=xml|junit[:path] </td><td>Path of xml report.</td></tr>
@@ -118,7 +118,7 @@
118118 */
119119
120120 /**
121- * @page CHANGELOG 変更履歴
121+ * @page changelog 変更履歴
122122 * @par Changes
123123 <ul>
124124 <li>v1.17.1.0
--- trunk/shippable.yml (revision 1407)
+++ trunk/shippable.yml (revision 1408)
@@ -2,7 +2,7 @@
22
33 language: python
44
5-python: 2.7
5+python: 3.7
66 cache: true
77 parallelized_test: true
88
@@ -34,7 +34,8 @@
3434 env:
3535 matrix:
3636 - WANDBOX_COMPILER=gcc-head
37- - WANDBOX_COMPILER=gcc-9.2.0
37+ - WANDBOX_COMPILER=gcc-9.3.0
38+ # - WANDBOX_COMPILER=gcc-9.2.0
3839 # - WANDBOX_COMPILER=gcc-9.1.0
3940 - WANDBOX_COMPILER=gcc-8.3.0
4041 # - WANDBOX_COMPILER=gcc-8.2.0
@@ -65,6 +66,7 @@
6566 - WANDBOX_COMPILER=gcc-4.5.4
6667 - WANDBOX_COMPILER=gcc-4.4.7
6768 - WANDBOX_COMPILER=clang-head IUWANDBOX_ADD_OPTION=-f"-Wno-c++11-inline-namespace"
69+ - WANDBOX_COMPILER=clang-10.0.0
6870 - WANDBOX_COMPILER=clang-9.0.0
6971 - WANDBOX_COMPILER=clang-8.0.0
7072 - WANDBOX_COMPILER=clang-7.0.0
--- trunk/test/CommonMakefile.in (revision 1407)
+++ trunk/test/CommonMakefile.in (revision 1408)
@@ -168,6 +168,7 @@
168168 $(OUTDIR)/flagfile_tests \
169169 $(OUTDIR)/invalid_locale_ctype_tests \
170170 $(OUTDIR)/ostream_formatter_tests \
171+ $(OUTDIR)/output_long_type_param_tests \
171172 $(OUTDIR)/output_tests \
172173 $(OUTDIR)/output_xml_invalid_path_tests \
173174 $(OUTDIR)/output_xml_repeat_tests \
--- trunk/test/internal_log_tests.cpp (revision 1407)
+++ trunk/test/internal_log_tests.cpp (revision 1408)
@@ -25,6 +25,8 @@
2525 {
2626 IUTEST_INIT(&argc, argv);
2727 #if !defined(IUTEST_USE_GTEST)
28+ ::iutest::IUTEST_FLAG(locale_ctype) = "";
29+
2830 IUTEST_LOG_(INFO) << "a";
2931
3032 ::iutest::IUTEST_FLAG(warning_into_error) = false;
--- trunk/test/logger_tests.hpp (revision 1407)
+++ trunk/test/logger_tests.hpp (revision 1408)
@@ -29,18 +29,12 @@
2929 {
3030 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
3131 char buf[4096] = { 0 };
32-#ifdef va_copy
3332 va_list va2;
34- va_copy(va2, va);
33+ iu_va_copy(va2, va);
3534 vsprintf(buf, fmt, va2);
3635 va_end(va2);
3736 m_log += buf;
3837 ::iutest::detail::iuConsole::nl_voutput(fmt, va);
39-#else
40- vsprintf(buf, fmt, va);
41- m_log += buf;
42- ::iutest::detail::iuConsole::nl_output("%s", buf);
43-#endif
4438 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
4539 }
4640 void clear(void) { m_log.clear(); }
--- trunk/test/output_long_type_param_tests.cpp (nonexistent)
+++ trunk/test/output_long_type_param_tests.cpp (revision 1408)
@@ -0,0 +1,116 @@
1+//======================================================================
2+//-----------------------------------------------------------------------
3+/**
4+ * @file output_xml_long_type_param_tests.cpp
5+ * @brief xml 出力対応テスト
6+ *
7+ * @author t.shirayanagi
8+ * @par copyright
9+ * Copyright (C) 2020, Takazumi Shirayanagi\n
10+ * This software is released under the new BSD License,
11+ * see LICENSE
12+*/
13+//-----------------------------------------------------------------------
14+//======================================================================
15+
16+//======================================================================
17+// include
18+#define IUTEST_HAS_VARIADIC_TEMPLATES 0
19+
20+#include "iutest.hpp"
21+
22+#if !defined(IUTEST_USE_GTEST) && IUTEST_HAS_STRINGSTREAM && IUTEST_HAS_ASSERTION_RETURN && IUTEST_HAS_TYPED_TEST
23+# define OUTPUT_XML_TEST 1
24+#else
25+# define OUTPUT_XML_TEST 0
26+#endif
27+
28+#if OUTPUT_XML_TEST
29+
30+class FileIO : public ::iutest::StringStreamFile
31+{
32+public:
33+ static ::std::string s_io;
34+
35+ virtual void Close()
36+ {
37+ s_io = ss.str();
38+ }
39+};
40+
41+::std::string FileIO::s_io;
42+
43+template<IUTEST_PP_ENUM_SHIFTED_PARAMS(50, typename A)>
44+struct TestType {};
45+
46+class TestNone {};
47+
48+typedef TestType<IUTEST_PP_ENUM(50, IIUT_PP_REPEAT_PARAMS_MACRO_, TestNone)> AliasTestType;
49+
50+IUTEST_FILESYSTEM_INSTANTIATE(FileIO);
51+
52+template<typename T>
53+class MultiTypedTest : public ::iutest::Test
54+{
55+};
56+typedef ::iutest::Types< ::iutest::Types<int, float>, AliasTestType > MultiTypedTestTypes;
57+
58+IUTEST_TYPED_TEST_CASE(MultiTypedTest, MultiTypedTestTypes);
59+
60+IUTEST_TYPED_TEST(MultiTypedTest, Get)
61+{
62+}
63+
64+class HackXmlGeneratorListener : public ::iutest::DefaultXmlGeneratorListener
65+{
66+ HackXmlGeneratorListener() : ::iutest::DefaultXmlGeneratorListener("") {}
67+public:
68+ using DefaultXmlGeneratorListener::EscapeXmlAttribute;
69+ using DefaultXmlGeneratorListener::EscapeXmlText;
70+};
71+
72+#endif
73+
74+#ifdef UNICODE
75+int wmain(int argc, wchar_t* argv[])
76+#else
77+int main(int argc, char* argv[])
78+#endif
79+{
80+#if OUTPUT_XML_TEST
81+ IUTEST_INIT(&argc, argv);
82+
83+ const ::std::string type_param1 = iutest::detail::GetTypeNameProxy< ::iutest::Types<int, float> >::GetTypeName();
84+ const ::std::string type_param2 = iutest::detail::GetTypeNameProxy< AliasTestType >::GetTypeName();
85+ const ::std::string xml_type_param1 = HackXmlGeneratorListener::EscapeXmlAttribute(type_param1);
86+ const ::std::string xml_type_param2 = HackXmlGeneratorListener::EscapeXmlAttribute(type_param2);
87+
88+ ::iutest::IUTEST_FLAG(output) = "xml:test.xml";
89+ {
90+ const int ret = IUTEST_RUN_ALL_TESTS();
91+
92+ if( ret != 0 ) return 1;
93+ IUTEST_ASSERT_EQ(::std::string::npos, FileIO::s_io.find("iutest::detail::None")) << FileIO::s_io << ::iutest::AssertionReturn<int>(1);
94+ IUTEST_ASSERT_NE(::std::string::npos, FileIO::s_io.find(xml_type_param1)) << FileIO::s_io << ::iutest::AssertionReturn<int>(1);
95+ IUTEST_ASSERT_NE(::std::string::npos, FileIO::s_io.find(xml_type_param2)) << FileIO::s_io << ::iutest::AssertionReturn<int>(1);
96+ FileIO::s_io.clear();
97+ }
98+
99+ ::iutest::IUTEST_FLAG(output) = "junit:test.xml";
100+ {
101+ const int ret = IUTEST_RUN_ALL_TESTS();
102+
103+ if( ret != 0 ) return 1;
104+ IUTEST_ASSERT_EQ(::std::string::npos, FileIO::s_io.find("iutest::detail::None")) << FileIO::s_io << ::iutest::AssertionReturn<int>(1);
105+ IUTEST_ASSERT_NE(::std::string::npos, FileIO::s_io.find(xml_type_param1)) << FileIO::s_io << ::iutest::AssertionReturn<int>(1);
106+ IUTEST_ASSERT_NE(::std::string::npos, FileIO::s_io.find(xml_type_param2)) << FileIO::s_io << ::iutest::AssertionReturn<int>(1);
107+ FileIO::s_io.clear();
108+ }
109+ printf("*** Successful ***\n");
110+#else
111+ (void)argc;
112+ (void)argv;
113+ printf("*** OUTPUT_XML_TEST=0 ***\n");
114+#endif
115+ return 0;
116+}
--- trunk/test/repository/Makefile (nonexistent)
+++ trunk/test/repository/Makefile (revision 1408)
@@ -0,0 +1,14 @@
1+#
2+#
3+#
4+# Copyright (C) 2020, Takazumi Shirayanagi
5+# This software is released under the new BSD License,
6+# see LICENSE
7+
8+default: check-fullpath check-remote-crlf
9+
10+check-fullpath:
11+ ! find ../../projects -type f -print | xargs grep '[d-zD-Z]:\\'
12+
13+check-remote-crlf:
14+ ! git grep --cached -I -l -P '\r'
\ No newline at end of file
--- trunk/test/typed_test_tests.cpp (revision 1407)
+++ trunk/test/typed_test_tests.cpp (revision 1408)
@@ -95,8 +95,8 @@
9595 #if IUTEST_HAS_STATIC_ASSERT_TYPEEQ
9696 ::iutest::StaticAssertTypeEq< Type1, int >();
9797 #endif
98- IUTEST_SUCCEED() << ::iutest::detail::GetTypeName< Type1 >();
99- IUTEST_SUCCEED() << ::iutest::detail::GetTypeName< Type2 >();
98+ IUTEST_SUCCEED() << ::iutest::detail::GetTypeNameProxy< Type1 >::GetTypeName();
99+ IUTEST_SUCCEED() << ::iutest::detail::GetTypeNameProxy< Type2 >::GetTypeName();
100100 }
101101
102102 #endif
--- trunk/tools/wandbox/iuwandbox.py (revision 1407)
+++ trunk/tools/wandbox/iuwandbox.py (revision 1408)
@@ -749,19 +749,24 @@
749749 if 'switches' in d:
750750 switches = d['switches']
751751 for s in switches:
752- if 'options' in s:
753- default_option = s['default']
754- print(s['name'])
755- for o in s['options']:
756- if o['name'] == default_option:
757- print(' ' + o['name'] + ' (default)')
752+ try:
753+ if 'options' in s:
754+ default_option = s['default']
755+ if 'name' in s:
756+ print(s['name'])
757+ for o in s['options']:
758+ if o['name'] == default_option:
759+ print(' ' + o['name'] + ' (default)')
760+ else:
761+ print(' ' + o['name'])
762+ elif 'name' in s:
763+ if s['default']:
764+ print(s['name'] + ' (default)')
758765 else:
759- print(' ' + o['name'])
760- elif 'name' in s:
761- if s['default']:
762- print(s['name'] + ' (default)')
763- else:
764- print(s['name'])
766+ print(s['name'])
767+ except KeyError:
768+ print("unknown format:")
769+ print(s)
765770
766771
767772 def get_options(compiler):
--- trunk/tools/wandbox/wandbox.py (revision 1407)
+++ trunk/tools/wandbox/wandbox.py (revision 1408)
@@ -69,7 +69,10 @@
6969 payload = json.dumps(self.parameter)
7070 response = requests.post(self.api_url + '/compile.json', data=payload, headers=headers)
7171 response.raise_for_status()
72- return response.json()
72+ try:
73+ return response.json()
74+ except json.decoder.JSONDecodeError as e:
75+ raise requests.exceptions.HTTPError(e, response.status_code)
7376
7477 def code(self, code):
7578 """
--- trunk/wercker.yml (revision 1407)
+++ trunk/wercker.yml (revision 1408)
@@ -6,7 +6,7 @@
66 # If you want Google's container you would reference google/python
77 # Read more about containers on our dev center
88 # http://devcenter.wercker.com/docs/containers/index.html
9-box: python:2.7
9+box: python
1010 # You can also use services such as databases. Read more on our dev center:
1111 # http://devcenter.wercker.com/docs/services/index.html
1212 # services:
@@ -25,15 +25,6 @@
2525 # Read more about steps on our dev center:
2626 # http://devcenter.wercker.com/docs/steps/index.html
2727 steps:
28- # A step that sets up the python virtual environment
29- - virtualenv:
30- name: setup virtual environment
31-
32- # # Use this virtualenv step for python 3.2
33- # - virtualenv
34- # name: setup virtual environment
35- # python_location: /usr/bin/python3.2
36-
3728 # A step that executes `pip install` command.
3829 - pip-install:
3930 requirements_file: ""
@@ -59,9 +50,6 @@
5950
6051 wandbox:
6152 steps:
62- - virtualenv:
63- name: setup virtual environment
64-
6553 - pip-install:
6654 requirements_file: ""
6755 packages_list: "requests"
@@ -97,9 +85,6 @@
9785
9886 wandbox-all-compiler:
9987 steps:
100- - virtualenv:
101- name: setup virtual environment
102-
10388 - pip-install:
10489 requirements_file: ""
10590 packages_list: "requests"
Show on old repository browser