Skip to content

Commit 824c633

Browse files
authored
v1.1x (#3)
update googletest to v1.11
1 parent d8fa111 commit 824c633

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.circleci/config.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,22 @@ version: 2.0
33
jobs:
44
build:
55
docker:
6-
- image: circleci/python:2.7-stretch-browsers
6+
- image: cimg/python:3.10
77
environment:
8-
GTEST_ROOT: googletest-release-1.8.1/googletest
8+
GTEST_ROOT: googletest-release-1.11.0/googletest
99
steps:
1010
- checkout
1111
- run: sudo apt-get install cmake
1212
- run: "curl -fsSL https://testspace-client.s3.amazonaws.com/testspace-linux.tgz | sudo tar -zxvf- -C /usr/local/bin"
1313
- run: "testspace config url samples.testspace.com"
1414
- run: "sudo pip install gcovr"
15-
- run: "wget https://github.com/google/googletest/archive/release-1.8.1.zip"
16-
- run: "unzip release-1.8.1.zip"
17-
- run: "mkdir -p $GTEST_ROOT/build && cd $GTEST_ROOT/build && cmake -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../ && make clean gtest"
15+
- run: "curl -fsSL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz | tar -zxvf-"
16+
- run: |
17+
mkdir -p $GTEST_ROOT/build
18+
pushd $GTEST_ROOT/build
19+
cmake -DGOOGLETEST_VERSION=1.11.0 -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
20+
make clean gtest
21+
popd
1822
- run: make -C $GTEST_ROOT/build |& tee build.log ; test ${PIPESTATUS[0]} -eq 0
1923
- run: $GTEST_ROOT/build/sample1_unittest --gtest_output=xml:sample1.xml
2024
- run: $GTEST_ROOT/build/sample2_unittest --gtest_output=xml:sample2.xml

.github/workflows/ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,25 @@ jobs:
88
build:
99
runs-on: ubuntu-18.04
1010
env:
11-
GTEST_ROOT: googletest-release-1.8.1/googletest
11+
GTEST_ROOT: googletest-release-1.11.0/googletest
1212
steps:
13-
- uses: actions/setup-python@v2
13+
- uses: actions/setup-python@v3
1414
with:
15-
python-version: 2.7
15+
python-version: 3.x
1616
- name: Setup build tools
1717
run: |
1818
sudo apt-get install cmake
1919
sudo pip install gcovr
20-
- uses: actions/checkout@v2
21-
with:
22-
fetch-depth: 50
20+
- uses: actions/checkout@v3
2321
- uses: testspace-com/setup-testspace@v1
2422
with:
2523
domain: samples
2624
- name: Install GTest
2725
run: |
28-
wget https://github.com/google/googletest/archive/release-1.8.1.zip
29-
unzip release-1.8.1.zip
26+
curl -fsSL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz | tar -zxvf-
3027
mkdir -p $GTEST_ROOT/build
3128
pushd $GTEST_ROOT/build
32-
cmake -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
29+
cmake -DGOOGLETEST_VERSION=1.11.0 -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
3330
make clean gtest
3431
popd
3532
- name: Build

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ language:
33

44
env:
55
global:
6-
- GTEST_ROOT=$TRAVIS_BUILD_DIR/googletest-release-1.8.1/googletest
6+
- GTEST_ROOT=$TRAVIS_BUILD_DIR/googletest-release-1.11.0/googletest
77

88
before_install:
99
- mkdir -p $HOME/bin
1010
- curl -fsSL https://testspace-client.s3.amazonaws.com/testspace-linux.tgz | tar -zxvf- -C $HOME/bin
1111
- testspace config url samples.testspace.com
1212
- testspace -v
1313
- pip install --user gcovr
14-
- wget https://github.com/google/googletest/archive/release-1.8.1.zip
15-
- unzip release-1.8.1.zip
14+
- curl -fsSL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz | tar -zxvf-
1615
- mkdir -p $GTEST_ROOT/build
1716

1817
install:
1918
- pushd $GTEST_ROOT/build
20-
- cmake -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
19+
- cmake -DGOOGLETEST_VERSION=1.11.0 -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
2120
- make clean gtest
2221
- popd
2322

0 commit comments

Comments
 (0)