Merge pull request #82 from Infomaniak/KDESKTOP-800-Integrate-parmsdb…

…-test-to-CI [KDESKTOP-800] Add Parmsdb tests to CI
Infomaniak · May 1, 2024 · 3ea935a · 3ea935a
2 parents b07e33f + 87662b6
commit 3ea935a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -11,6 +11,8 @@ concurrency:
 jobs:
   build-kDrive:
     runs-on: [ self-hosted, Linux, X64, desktop-kdrive ]
+    env:
+      bin-directory: ./build-linux/build/bin
 
     steps:
       - name: Checkout the PR
@@ -23,10 +25,13 @@ jobs:
       - name: Build kDrive desktop
         run : ./infomaniak-build-tools/linux/build-ci-amd64.sh
 
-      - name: Grant test_common execute permission
-        run : chmod +x ./build-linux/build/bin/kDrive_test_common
       - name: Execute common tests
-        run : ./build-linux/build/bin/kDrive_test_common
+        run : ./kDrive_test_common
+        working-directory: ${{env.bin-directory}}
+
+      - name: Execute parms tests
+        run : ./kDrive_test_parms
+        working-directory: ${{env.bin-directory}}
 
       - name: Clean-up generated code
         run : rm -rf build-linux
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -11,6 +11,8 @@ concurrency:
 jobs:
   build-kDrive:
     runs-on: [ self-hosted, macOS, desktop-kdrive ]
+    env:
+      bin-directory: ./build-macos/install
 
     steps:
       - name: Checkout the code
@@ -27,7 +29,12 @@ jobs:
         run : ./infomaniak-build-tools/macos/build-ci.sh
 
       - name: Execute common tests
-        run : ./build-macos/client/bin/kDrive_test_common
+        run : ./kDrive_test_common
+        working-directory: ${{env.bin-directory}}
+
+      - name: Execute parms tests
+        run : ./kDrive_test_parms
+        working-directory: ${{env.bin-directory}}
 
       - name: Clean-up generated code
         run : rm -rf build-macos
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,6 +11,8 @@ concurrency:
 jobs:
   build-kDrive:
     runs-on: [ self-hosted, Windows, desktop-kdrive ]
+    env:
+      bin-directory: ./build-windows/install/bin/
 
     steps:
       - name: Checkout the PR
@@ -39,7 +41,12 @@ jobs:
         shell: cmd
 
       - name: Execute common tests
-        run: ./build-windows/install/bin/kDrive_test_common.exe
+        run: ./kDrive_test_common.exe
+        working-directory: ${{env.bin-directory}}
+
+      - name: Execute parms tests
+        run: ./kDrive_test_parms.exe
+        working-directory: ${{env.bin-directory}}
 
       - name: Clean-up generated code
         run : powershell ./infomaniak-build-tools/windows/build-drive.ps1 -clean all
diff --git a/infomaniak-build-tools/linux/build-ci-amd64.sh b/infomaniak-build-tools/linux/build-ci-amd64.sh
@@ -50,3 +50,5 @@ cmake -B$BUILDDIR -H$BASEPATH \
 
 make -j4
 make DESTDIR=$APPDIR install
+
+cp $BASEPATH/sync-exclude-linux.lst $BUILDDIR/bin/sync-exclude.lst
diff --git a/infomaniak-build-tools/macos/build-ci.sh b/infomaniak-build-tools/macos/build-ci.sh
@@ -92,5 +92,9 @@ cmake \
 	"$SRCDIR"
 
 # Build kDrive sources
-make
+make install
+
+# Move tester to the install dir (So they can access ressources)
+mv $BUILDDIR/bin/kDrive_test_* $INSTALLDIR/
+
 popd
diff --git a/infomaniak-build-tools/windows/build-drive.ps1 b/infomaniak-build-tools/windows/build-drive.ps1
@@ -398,6 +398,7 @@ if ($ci)
 	{
 		Copy-Item -Path "$buildPath/bin/$file" -Destination "$archivePath"
 	}
+	Copy-Item -Path "$path/sync-exclude-win.lst" -Destination "$archivePath/sync-exclude.lst"
 	exit $LASTEXITCODE
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,3 +50,5 @@ cmake -B$BUILDDIR -H$BASEPATH \

		make -j4
		make DESTDIR=$APPDIR install

		cp $BASEPATH/sync-exclude-linux.lst $BUILDDIR/bin/sync-exclude.lst
-Original file line number
+Diff line change
@@ Expand Up / @@ -398,6 +398,7 @@ if ($ci) @@
     	{
     		Copy-Item -Path "$buildPath/bin/$file" -Destination "$archivePath"
     	}
+    	Copy-Item -Path "$path/sync-exclude-win.lst" -Destination "$archivePath/sync-exclude.lst"
     	exit $LASTEXITCODE
     }
@@ Expand Down @@