Skip to content

Commit

Permalink
chore: fixed CI build pathes
Browse files Browse the repository at this point in the history
  • Loading branch information
fmoessbauer committed Jul 11, 2019
1 parent dda19fa commit fee0bb9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions contrib/build-ci.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down
8 changes: 4 additions & 4 deletions contrib/generate-ci.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..

Expand Down

0 comments on commit fee0bb9

Please sign in to comment.