@@ -102,7 +102,7 @@ jobs:
102102 cd ..
103103 rm -rf __build
104104
105- - name : Run modules tests wihtout 'import std;'
105+ - name : Run modules tests without 'import std;'
106106 if : ${{matrix.toolset == 'clang-19'}}
107107 run : |
108108 cd ../boost-root/libs/type_index
@@ -142,9 +142,9 @@ jobs:
142142 chmod +x $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh
143143 wget https://github.com/linux-test-project/lcov/archive/v1.15.zip
144144 unzip v1.15.zip
145- LCOV="`pwd `/lcov-1.15/bin/lcov --gcov-tool $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh"
145+ LCOV="`working-directory `/lcov-1.15/bin/lcov --gcov-tool $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh"
146146
147- echo "$LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory `pwd `/libs/$LIBRARY/test --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info"
147+ echo "$LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory `working-directory `/libs/$LIBRARY/test --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info"
148148 $LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory ../boost-root/ --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info
149149 $LCOV --remove $GITHUB_WORKSPACE/coveralls/coverage.info "/usr*" "*/$LIBRARY/test/*" ${{matrix.ignore_coverage}} "*/$LIBRARY/tests/*" "*/$LIBRARY/examples/*" "*/$LIBRARY/example/*" -o $GITHUB_WORKSPACE/coveralls/coverage.info
150150
@@ -209,55 +209,41 @@ jobs:
209209 python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--jobs 3" %LIBRARY%
210210 cmd /c bootstrap
211211
212+ - name : Install Ninja
213+ if : ${{matrix.toolset == 'msvc-14.3'}}
214+ run : choco install --no-progress ninja
215+
212216 - name : Run CMake tests
213217 if : ${{matrix.toolset == 'msvc-14.3'}}
214218 shell : cmd
219+ working-directory : boost-root
215220 run : |
216- choco install --no-progress ninja
217- call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvarsall.bat" x64
218- cd ../boost-root/
219- mkdir __build
220- cd __build
221- cmake -DBUILD_TESTING=1 -DBOOST_INCLUDE_LIBRARIES=type_index ..
222- cmake --build . --target tests --config Debug
223- ctest --output-on-failure --no-tests=error -C Debug
224- cd ..
225- rm -rf __build
221+ cmake -DBUILD_TESTING=1 -DBOOST_INCLUDE_LIBRARIES=type_index -G Ninja -B __build_cmake .
222+ cmake --build . --target tests --config Debug -B __build_cmake
223+ ctest --output-on-failure --no-tests=error -C Debug -B __build_cmake
226224
227225 - name : Run modules tests
228226 if : ${{matrix.toolset == 'msvc-14.3'}}
229227 shell : cmd
228+ working-directory : boost-root
230229 run : |
231- choco install --no-progress ninja
232- call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvarsall.bat" x64
233- cd ../boost-root/libs/type_index
234- mkdir build_module
235- cd build_module
236- cmake -DBOOST_USE_MODULES=1 -DBUILD_TESTING=1 -DCMAKE_CXX_STANDARD=23 -DCMAKE_EXPERIMENTAL_CXX_IMPORT_STD=0e5b6991-d74f-4b3d-a41c-cf096e0b2508 -G Ninja ../test/cmake_subdir_test/
237- cmake --build .
238- ctest --no-tests=error -V
239- cd ..
240- rm -rf build_module
230+ cmake -DBOOST_USE_MODULES=1 -DBUILD_TESTING=1 -DCMAKE_CXX_STANDARD=23 -DCMAKE_EXPERIMENTAL_CXX_IMPORT_STD=0e5b6991-d74f-4b3d-a41c-cf096e0b2508 -G Ninja -B __build_modules libs/type_index/test/cmake_subdir_test
231+ cmake --build . -B __build_modules
232+ ctest --no-tests=error -V -B __build_modules
241233
242234 - name : Run modules tests without 'import std;'
243235 if : ${{matrix.toolset == 'msvc-14.3'}}
244236 shell : cmd
237+ working-directory : boost-root
245238 run : |
246- choco install --no-progress ninja
247- call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvarsall.bat" x64
248- cd ../boost-root/libs/type_index
249- mkdir build_module
250- cd build_module
251- cmake -DBOOST_USE_MODULES=1 -DBUILD_TESTING=1 -DCMAKE_CXX_STANDARD=20 -G Ninja ../test/cmake_subdir_test/
252- cmake --build .
253- ctest --no-tests=error -V
254- cd ..
255- rm -rf build_module
239+ cmake -DBOOST_USE_MODULES=1 -DBUILD_TESTING=1 -DCMAKE_CXX_STANDARD=20 -G Ninja -B __build_modules_std libs/type_index/test/cmake_subdir_test
240+ cmake --build . -B __build_modules_std
241+ ctest --no-tests=error -V -B __build_modules_std
256242
257243 - name : Run tests
258244 shell : cmd
245+ working-directory : boost-root
259246 run : |
260- cd ../boost-root
261247 b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release embed-manifest-via=linker
262248
263249 finish :
0 commit comments