• R/O
  • SSH
  • HTTPS

iutest: 提交


Commit MetaInfo

修訂1438 (tree)
時間2021-06-01 10:54:06
作者srz_zumix

Log Message

Merge remote-tracking branch 'origin/develop'

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

Change Summary

差異

--- trunk/README.md (revision 1437)
+++ trunk/README.md (revision 1438)
@@ -141,12 +141,12 @@
141141 |[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)|
142142 |[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=master)](https://github.com/srz-zumix/iutest/actions?query=workflow%3A%22GitHubPages%22+branch%3Amaster)||Update documents|
143143 |[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)|
144+|[JFrog Pipelines](https://zumix.jfrog.io/ui/pipelines/myPipelines/default/iutest_centos_basic_test)| | |CentOS gcc/clang Baisc test|
144145 |[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)|fused-src tests|
145146 |[Razorops](https://razorops.com/)|[![RazorOps Build Status](https://api.razorops.com/apps/long-flower-9433/badge.svg?branch=master)](https://dashboard.razorops.com/apps/long-flower-9433/workflows)|[![RazorOps Build Status](https://api.razorops.com/apps/long-flower-9433/badge.svg?branch=develop)](https://dashboard.razorops.com/apps/long-flower-9433/workflows)|CentOS7 Basic test|
146147 |[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|
147148 |[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|
148149 |[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|
149-|[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)|CentOS gcc/clang Baisc test|
150150 |[TeamCity Cloud](https://www.jetbrains.com/teamcity/cloud/)|[![TeamCity Cloud Build Status](https://iutest.beta.teamcity.com/app/rest/builds/buildType:Iutest_GoogleTestCompatibleTest/statusIcon)](https://iutest.beta.teamcity.com/viewType.html?buildTypeId=Iutest_GoogleTestCompatibleTest&guest=1)||Google Test compatible test for released versions|
151151 |[TeamCity Cloud](https://www.jetbrains.com/teamcity/cloud/)|[![TeamCity Cloud Build Status](https://iutest.beta.teamcity.com/app/rest/builds/buildType:Iutest_GoogleMockCompatibleTest/statusIcon)](https://iutest.beta.teamcity.com/viewType.html?buildTypeId=Iutest_GoogleMockCompatibleTest&guest=1)||Google Mock compatible test for released versions|
152152 |[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, Coverity-scan|
--- trunk/include/internal/iutest_stdlib_defs.hpp (revision 1437)
+++ trunk/include/internal/iutest_stdlib_defs.hpp (revision 1438)
@@ -444,31 +444,6 @@
444444 # define IUTEST_HAS_HDR_CXXABI 0
445445 #endif
446446
447-//======================================================================
448-// include
449-#include <iterator>
450-
451-#if IUTEST_HAS_CXX_HDR_ANY
452-# include <any>
453-#endif
454-#if IUTEST_HAS_CXX_HDR_CSTDINT
455-# include <cstdint>
456-#endif
457-#if IUTEST_HAS_CXX_HDR_FILESYSTEM
458-# include <filesystem>
459-#endif
460-#if IUTEST_HAS_CXX_HDR_OPTIONAL
461-# include <optional>
462-#endif
463-#if IUTEST_HAS_CXX_HDR_VARIANT
464-# include <variant>
465-#endif
466-#if IUTEST_HAS_CXX_HDR_CHARCONV
467-# include <charconv>
468-#endif
469-
470-//======================================================================
471-// define
472447 #if !defined(IUTEST_HAS_STD_FILESYSTEM)
473448 # if defined(ANDROID) || defined(__ANDROID__) || defined(__ARM_EABI__)
474449 # define IUTEST_HAS_STD_FILESYSTEM 0
@@ -662,4 +637,27 @@
662637 # endif
663638 #endif
664639
640+//======================================================================
641+// include
642+#include <iterator>
643+
644+#if IUTEST_HAS_CXX_HDR_ANY
645+# include <any>
646+#endif
647+#if IUTEST_HAS_CXX_HDR_CSTDINT
648+# include <cstdint>
649+#endif
650+#if IUTEST_HAS_CXX_HDR_FILESYSTEM && IUTEST_HAS_STD_FILESYSTEM
651+# include <filesystem>
652+#endif
653+#if IUTEST_HAS_CXX_HDR_OPTIONAL
654+# include <optional>
655+#endif
656+#if IUTEST_HAS_CXX_HDR_VARIANT
657+# include <variant>
658+#endif
659+#if IUTEST_HAS_CXX_HDR_CHARCONV
660+# include <charconv>
661+#endif
662+
665663 #endif // INCG_IRIS_IUTEST_STDLIB_DEFS_HPP_9C62C097_E5FB_49EE_9329_811F32C846A2_
--- trunk/include/iutest_ver.hpp (revision 1437)
+++ trunk/include/iutest_ver.hpp (revision 1438)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01179908u //!< iutest version 1.17.99.8
20+#define IUTEST_VER 0x01179909u //!< iutest version 1.17.99.9
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x17u //!< Minor Version
2323 #define IUTEST_MICROVER 0x99u //!< Micro Version
24-#define IUTEST_REVISION 0x08u //!< Revision
24+#define IUTEST_REVISION 0x09u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
--- trunk/jfrog-pipelines.yml (nonexistent)
+++ trunk/jfrog-pipelines.yml (revision 1438)
@@ -0,0 +1,69 @@
1+resources:
2+ - name: iutest_gitRepo
3+ type: GitRepo
4+ configuration:
5+ gitProvider: GitHub
6+ path: srz-zumix/iutest
7+ branches:
8+ include: master|^jfrog/.*
9+ # https://www.jfrog.com/confluence/display/JFROG/Triggering+Pipelines+and+Steps#TriggeringPipelinesandSteps-CancellingPreviousRunsOnaGitRepositoryChange
10+ cancelPendingRunsOn:
11+ newCommit: true
12+ pullRequestUpdate: true
13+pipelines:
14+ - name: iutest_centos_basic_test
15+ configuration:
16+ nodePool: centos-latest
17+ runtime:
18+ type: image
19+ image:
20+ auto:
21+ language: cpp
22+ versions:
23+ - "9.0.1"
24+ steps:
25+ - name: gcc
26+ type: Bash
27+ configuration:
28+ inputResources:
29+ - name: iutest_gitRepo
30+ execution:
31+ onStart:
32+ - update_commit_status iutest_gitRepo # Status: "processing"
33+ onExecute:
34+ - update_commit_status iutest_gitRepo # Status: "processing"
35+ - yum install -y make
36+ - pushd ${res_iutest_gitRepo_resourcePath}
37+ - make -C test showcxxversion showcxxmacros
38+ - make -C test -j2
39+ - make -C test test
40+ - make -C test report
41+ - popd
42+ onFailure:
43+ - update_commit_status iutest_gitRepo # Status: "failure"
44+ onSuccess:
45+ - update_commit_status iutest_gitRepo # Status: "success"
46+ - name: clang
47+ type: Bash
48+ configuration:
49+ environmentVariables:
50+ CC: clang
51+ CXX: clang++
52+ inputResources:
53+ - name: iutest_gitRepo
54+ execution:
55+ onStart:
56+ - update_commit_status iutest_gitRepo # Status: "processing"
57+ onExecute:
58+ - update_commit_status iutest_gitRepo # Status: "processing"
59+ - yum install -y make
60+ - pushd ${res_iutest_gitRepo_resourcePath}
61+ - make -C test showcxxversion showcxxmacros
62+ - make -C test -j2
63+ - make -C test test
64+ - make -C test report
65+ - popd
66+ onFailure:
67+ - update_commit_status iutest_gitRepo # Status: "failure"
68+ onSuccess:
69+ - update_commit_status iutest_gitRepo # Status: "success"
--- trunk/test/filepath_tests.cpp (revision 1437)
+++ trunk/test/filepath_tests.cpp (revision 1438)
@@ -81,16 +81,15 @@
8181 ::iutest::internal::FilePath path("path");
8282 IUTEST_EXPECT_FALSE(path.IsRootDirectory());
8383 }
84-// FIXME: https://github.com/srz-zumix/iutest/issues/589
85-// {
86-// #ifdef IUTEST_OS_WINDOWS
87-// ::iutest::internal::FilePath path("C:\\");
88-// IUTEST_EXPECT_TRUE(path.IsRootDirectory());
89-// #else
90-// ::iutest::internal::FilePath path("/");
91-// IUTEST_EXPECT_TRUE(path.IsRootDirectory());
92-// #endif
93-// }
84+ {
85+#ifdef IUTEST_OS_WINDOWS
86+ ::iutest::internal::FilePath path("C:\\");
87+ IUTEST_EXPECT_TRUE(path.IsRootDirectory());
88+#else
89+ ::iutest::internal::FilePath path("/");
90+ IUTEST_EXPECT_TRUE(path.IsRootDirectory());
91+#endif
92+ }
9493 }
9594
9695 IUTEST(FilePath, IsAbsolutePath)
Show on old repository browser