Skip to content

Commit 15fb785

Browse files
committed
Move tests to test/
1 parent 00c932c commit 15fb785

File tree

9 files changed

+7
-7
lines changed

9 files changed

+7
-7
lines changed

.github/workflows/ccpp.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
fi
136136
ninja
137137
export QT_QPA_PLATFORM=minimal
138-
./src/test/CutterTest
138+
./test/CutterTest
139139
if [[ "${{ matrix.package || false }}" = "true" ]]
140140
then
141141
export CUTTER_VERSION=$(python ../scripts/get_version.py)
@@ -196,7 +196,7 @@ jobs:
196196
make package
197197
export CUTTER_VERSION=$(python3 ../scripts/get_version.py)
198198
echo PACKAGE_NAME=Cutter-${CUTTER_VERSION}-Darwin.dmg >> $GITHUB_ENV
199-
./src/test/CutterTest;
199+
./test/CutterTest;
200200
- name: windows dependencies
201201
if: contains(matrix.os, 'windows')
202202
shell: bash
@@ -235,7 +235,7 @@ jobs:
235235
..
236236
cmake --build . --config Release
237237
cmake --build . --config Release --target package
238-
src/test/CutterTest
238+
cd test; CutterTest
239239
echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV%
240240
- uses: actions/upload-artifact@v2
241241
if: env.PACKAGE_NAME != null

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,7 @@ add_subdirectory(src)
133133
if(CUTTER_ENABLE_PACKAGING)
134134
add_subdirectory(dist)
135135
endif()
136+
137+
if(CUTTER_ENABLE_TESTS)
138+
add_subdirectory(test)
139+
endif()

src/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,3 @@ if(UNIX AND NOT APPLE)
560560
DESTINATION "share/applications"
561561
COMPONENT Devel)
562562
endif()
563-
564-
if(CUTTER_ENABLE_TESTS)
565-
add_subdirectory(test)
566-
endif()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)