Move tests to test/

rizinorg · Feb 5, 2021 · cfd336d · cfd336d
1 parent 00c932c
commit cfd336d
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -135,7 +135,7 @@ jobs:
         fi
         ninja
         export QT_QPA_PLATFORM=minimal
-        ./src/test/CutterTest
+        ./test/CutterTest
         if [[ "${{ matrix.package || false }}" = "true" ]]
         then
           export CUTTER_VERSION=$(python ../scripts/get_version.py)
@@ -196,7 +196,7 @@ jobs:
         make package
         export CUTTER_VERSION=$(python3 ../scripts/get_version.py)
         echo PACKAGE_NAME=Cutter-${CUTTER_VERSION}-Darwin.dmg >> $GITHUB_ENV
-        ./src/test/CutterTest;
+        ./test/CutterTest;
     - name: windows dependencies
       if: contains(matrix.os, 'windows')
       shell: bash
@@ -235,7 +235,7 @@ jobs:
           ..
         cmake --build . --config Release
         cmake --build . --config Release --target package
-        src/test/CutterTest
+        cd test; CutterTest
         echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV%
     - uses: actions/upload-artifact@v2
       if: env.PACKAGE_NAME != null

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,3 +133,7 @@ add_subdirectory(src)
 if(CUTTER_ENABLE_PACKAGING)
 	add_subdirectory(dist)
 endif()
+
+if(CUTTER_ENABLE_TESTS)
+    add_subdirectory(test)
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -560,7 +560,3 @@ if(UNIX AND NOT APPLE)
         DESTINATION "share/applications"
         COMPONENT Devel)
 endif()
-
-if(CUTTER_ENABLE_TESTS)
-    add_subdirectory(test)
-endif()
diff --git a/src/test/AutoTest.h → test/AutoTest.h b/src/test/AutoTest.h → test/AutoTest.h
diff --git a/src/test/CMakeLists.txt → test/CMakeLists.txt b/src/test/CMakeLists.txt → test/CMakeLists.txt
diff --git a/src/test/CutterTest.cpp → test/CutterTest.cpp b/src/test/CutterTest.cpp → test/CutterTest.cpp
diff --git a/src/test/CutterTest.h → test/CutterTest.h b/src/test/CutterTest.h → test/CutterTest.h
diff --git a/src/test/TestHexdumpWidget.cpp → test/TestHexdumpWidget.cpp b/src/test/TestHexdumpWidget.cpp → test/TestHexdumpWidget.cpp
diff --git a/src/test/main.cpp → test/main.cpp b/src/test/main.cpp → test/main.cpp