Move tests to test/

This commit is contained in:
yossizap 2021-02-05 23:09:52 +00:00 committed by Florian Märkl
parent dfa5f3db49
commit ee9d2f04b7
9 changed files with 7 additions and 7 deletions

View File

@ -137,7 +137,7 @@ jobs:
fi fi
ninja ninja
export QT_QPA_PLATFORM=minimal export QT_QPA_PLATFORM=minimal
./src/test/CutterTest ./test/CutterTest
if [[ "${{ matrix.package || false }}" = "true" ]] if [[ "${{ matrix.package || false }}" = "true" ]]
then then
export CUTTER_VERSION=$(python ../scripts/get_version.py) export CUTTER_VERSION=$(python ../scripts/get_version.py)
@ -204,7 +204,7 @@ jobs:
export CUTTER_VERSION=$(python3 ../scripts/get_version.py) export CUTTER_VERSION=$(python3 ../scripts/get_version.py)
echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV
echo UPLOAD_ASSET_TYPE=application/x-apple-diskimage >> $GITHUB_ENVV echo UPLOAD_ASSET_TYPE=application/x-apple-diskimage >> $GITHUB_ENVV
./src/test/CutterTest; ./test/CutterTest;
- name: windows dependencies - name: windows dependencies
if: contains(matrix.os, 'windows') if: contains(matrix.os, 'windows')
shell: bash shell: bash
@ -244,7 +244,7 @@ jobs:
.. ..
cmake --build . --config Release cmake --build . --config Release
cmake --build . --config Release --target package cmake --build . --config Release --target package
src/test/CutterTest cd test; CutterTest
echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV% echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV%
echo UPLOAD_ASSET_TYPE=application/zip >> %GITHUB_ENV% echo UPLOAD_ASSET_TYPE=application/zip >> %GITHUB_ENV%
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2

View File

@ -136,3 +136,7 @@ add_subdirectory(src)
if(CUTTER_ENABLE_PACKAGING) if(CUTTER_ENABLE_PACKAGING)
add_subdirectory(dist) add_subdirectory(dist)
endif() endif()
if(CUTTER_ENABLE_TESTS)
add_subdirectory(test)
endif()

View File

@ -602,7 +602,3 @@ if(UNIX AND NOT APPLE)
DESTINATION "share/applications" DESTINATION "share/applications"
COMPONENT Devel) COMPONENT Devel)
endif() endif()
if(CUTTER_ENABLE_TESTS)
add_subdirectory(test)
endif()