diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4a60dd..4e9864d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ cppcheck: <<: *globals stage: validate script: - - cd ../build-tsan-dr791; C:\opt\Cppcheck\cppcheck.exe --project=compile_commands.json --enable=all --inline-suppr --suppressions-list=suppressions.txt --error-exitcode=1 --quiet + - cd build-tsan-dr791; C:\opt\Cppcheck\cppcheck.exe --project=compile_commands.json --enable=all --inline-suppr --suppressions-list=suppressions.txt --error-exitcode=1 --quiet - cd ../build-legacy-tsan-dr791; C:\opt\Cppcheck\cppcheck.exe --project=compile_commands.json --enable=all --inline-suppr --suppressions-list=suppressions.txt --error-exitcode=1 --quiet - cd ../build-dummy; C:\opt\Cppcheck\cppcheck.exe --project=compile_commands.json --enable=all --inline-suppr --suppressions-list=suppressions.txt --error-exitcode=1 --quiet dependencies: diff --git a/contrib/build-ci.bat b/contrib/build-ci.bat index 9814773..e3cfce4 100644 --- a/contrib/build-ci.bat +++ b/contrib/build-ci.bat @@ -3,13 +3,13 @@ echo "== Build DRace ===" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 echo "=== Build drace-TSAN DR 7.91.x ===" -cd build-tsan-dr790 +cd build-tsan-dr791 cmake --build . cmake --build . --target install cd .. echo "=== Build drace-LEGACY-TSAN DR 7.91.x ===" -cd build-legacy-tsan-dr790 +cd build-legacy-tsan-dr791 cmake --build . cmake --build . --target install cd .. diff --git a/contrib/generate-ci.bat b/contrib/generate-ci.bat index 1ba2079..1b89e2a 100644 --- a/contrib/generate-ci.bat +++ b/contrib/generate-ci.bat @@ -5,14 +5,14 @@ set CC=cl.exe set CXX=cl.exe echo "=== Generate drace-TSAN DR 7.91.x ===" -mkdir build-tsan-dr790 -cd build-tsan-dr790 +mkdir build-tsan-dr791 +cd build-tsan-dr791 cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDRACE_XML_EXPORTER=1 -DDRACE_ENABLE_TESTING=1 -DDRACE_ENABLE_BENCH=1 -DDynamoRIO_DIR=C:/opt/DynamoRIO-Windows-7.91.18081-0/cmake -DDRACE_DETECTOR=tsan -DCMAKE_INSTALL_PREFIX:PATH=package .. cd .. echo "=== Generate drace-LEGACY-TSAN DR 7.91.x ===" -mkdir build-legacy-tsan-dr790 -cd build-legacy-tsan-dr790 +mkdir build-legacy-tsan-dr791 +cd build-legacy-tsan-dr791 cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDRACE_USE_LEGACY_API=1 -DDRACE_ENABLE_TESTING=1 -DDRACE_ENABLE_BENCH=0 -DDynamoRIO_DIR=C:/opt/DynamoRIO-Windows-7.91.18081-0/cmake -DDRACE_DETECTOR=tsan -DCMAKE_INSTALL_PREFIX:PATH=package .. cd ..