Commit 6021b2670d919f2d69c80bc0121af7b57fef2545
1 parent
a2a79865
attempt to fix gtest failure
Showing
1 changed file
with
9 additions
and
7 deletions
make-ci.sh
| @@ -7,20 +7,22 @@ env | sort | @@ -7,20 +7,22 @@ env | sort | ||
| 7 | sudo apt-get update | 7 | sudo apt-get update |
| 8 | sudo apt-get install -y libhiredis-dev libev-dev libgtest-dev redis-server | 8 | sudo apt-get install -y libhiredis-dev libev-dev libgtest-dev redis-server |
| 9 | 9 | ||
| 10 | +# Clean | ||
| 11 | +rm -rf build | ||
| 12 | +mkdir build | ||
| 13 | +cd build | ||
| 14 | + | ||
| 10 | # Make gtest | 15 | # Make gtest |
| 11 | git clone https://github.com/google/googletest | 16 | git clone https://github.com/google/googletest |
| 12 | cd googletest | 17 | cd googletest |
| 13 | -mkdir -p build | 18 | +mkdir build |
| 14 | cd build | 19 | cd build |
| 15 | -cmake .. | ||
| 16 | -make | ||
| 17 | -sudo mv googlemock/gtest/libg* /usr/local/lib/ | 20 | +cmake -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DBUILD_SHARED_LIBS=ON .. |
| 21 | +time make | ||
| 22 | +sudo mv googletest/libg* /usr/local/lib/ | ||
| 18 | cd ../.. | 23 | cd ../.. |
| 19 | -rm -rf googletest | ||
| 20 | 24 | ||
| 21 | # Make redox | 25 | # Make redox |
| 22 | -mkdir -p build | ||
| 23 | -cd build | ||
| 24 | cmake -Dexamples=ON -Dlib=ON -Dstatic_lib=ON -Dtests=ON .. | 26 | cmake -Dexamples=ON -Dlib=ON -Dstatic_lib=ON -Dtests=ON .. |
| 25 | time make | 27 | time make |
| 26 | ./test_redox | 28 | ./test_redox |