From 8d384d7d85242be580a9abdb78e7dea1329c17e5 Mon Sep 17 00:00:00 2001
From: Cerapter <cerap@protonmail.com>
Date: Mon, 26 Apr 2021 21:12:13 +0200
Subject: [PATCH] Relocate test output to `bin/`.

The executables couldn't be run without the libraries next to them.
---
 .github/workflows/main.yml | 12 ++++++++++++
 akashi/akashi.pro          |  5 ++---
 lib/lib.pro                |  2 ++
 tests/tests_common.pri     |  5 ++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 69de29a..f4a2e8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,6 +28,12 @@ jobs:
           qmake
           make
           mv bin/config_sample bin/config
+
+      - name: Run tests
+        run |
+          for test in bin_tests/; do
+            ./$test
+          done;
           
       - name: Upload binary
         uses: actions/upload-artifact@v2
@@ -52,6 +58,12 @@ jobs:
           nmake
           windeployqt bin\akashi.exe --release --no-opengl-sw
           mv bin\config_sample bin\config
+
+      - name: Run tests
+        run |
+          for test in bin_tests/; do
+            ./$test
+          done;
           
       - name: Upload zip
         uses: actions/upload-artifact@v2
diff --git a/akashi/akashi.pro b/akashi/akashi.pro
index 8da7d72..5524e2a 100644
--- a/akashi/akashi.pro
+++ b/akashi/akashi.pro
@@ -26,9 +26,8 @@ RC_ICONS = resource/icon/akashi.ico
 SOURCES += main.cpp
 
 # Include the akashi library
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../lib/release/ -llib
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../lib/debug/ -llib
-else:unix: LIBS += -L$$OUT_PWD/../lib/ -llib
+win32: LIBS += -L$$PWD/../bin/ -llib
+else:unix: LIBS += -L$$PWD/../bin/ -llib
 
 INCLUDEPATH += $$PWD/../lib
 DEPENDPATH += $$PWD/../lib
diff --git a/lib/lib.pro b/lib/lib.pro
index 93ea1e0..c7a130a 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -5,6 +5,8 @@ TEMPLATE = lib
 
 CONFIG += shared c++11
 
+DESTDIR = $$PWD/../bin
+
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
diff --git a/tests/tests_common.pri b/tests/tests_common.pri
index cd4f6ee..9a8aada 100644
--- a/tests/tests_common.pri
+++ b/tests/tests_common.pri
@@ -5,9 +5,8 @@ CONFIG -= app_bundle
 
 DESTDIR = $$PWD/../bin_tests
 
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../lib/release/ -llib
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../lib/debug/ -llib
-else:unix: LIBS += -L$$OUT_PWD/../../lib/ -llib
+win32: LIBS += -L$$PWD/../bin/ -llib
+else:unix: LIBS += -L$$PWD/../bin/ -llib
 
 INCLUDEPATH += $$PWD/../lib
 DEPENDPATH += $$PWD/../lib