Revert "CI: parallelize integration test"

This reverts commit b1a03fa1cc.

Let's plug it as part of 'make inttest'
This commit is contained in:
Alexey Sokolov
2025-04-21 09:06:23 +01:00
parent 81e3c908ad
commit 4c8e780a60
3 changed files with 3 additions and 10 deletions

View File

@@ -27,6 +27,4 @@ build_script:
- c:\cygwin-root\bin\sh -lc "rebase -s -v $(cat /tmp/files-to-rebase)"
test_script:
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 unittest < /dev/null"
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; env ZNC_QT_VER=5 make VERBOSE=1 inttest_bin < /dev/null"
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; git clone --depth=1 https://github.com/google/gtest-parallel"
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; gtest-parallel/gtest-parallel test/integration/inttest"
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; env ZNC_QT_VER=5 make VERBOSE=1 inttest < /dev/null"

5
.github/build.sh vendored
View File

@@ -31,11 +31,8 @@ env LLVM_PROFILE_FILE="$PWD/unittest.profraw" make VERBOSE=1 unittest
sudo make install
/usr/local/bin/znc --version
git clone --depth=1 https://github.com/google/gtest-parallel
make VERBOSE=1 inttest_bin
# TODO: use DEVEL_COVER_OPTIONS for https://metacpan.org/pod/Devel::Cover
env LLVM_PROFILE_FILE="$PWD/inttest.profraw" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" PYTHONWARNINGS=error gtest-parallel/gtest-parallel test/integration/inttest
env LLVM_PROFILE_FILE="$PWD/inttest.profraw" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" PYTHONWARNINGS=error make VERBOSE=1 inttest
ls -lRa
~/perl5/bin/cover --no-gcov --report=clover

4
Jenkinsfile vendored
View File

@@ -26,9 +26,7 @@ timestamps {
stage('Integration test') {
withEnv(['GTEST_OUTPUT=xml:integration-test.xml']) {
sh 'make install'
sh 'make inttest_bin'
sh 'git clone --depth=1 https://github.com/google/gtest-parallel'
sh 'gtest-parallel/gtest-parallel test/integration/inttest'
sh 'make inttest'
}
}
junit '**/*test.xml'