qmake|Win32: Fixed tests for Windows

The deployment of tests is a bit more streamlined now.
skyjake · Oct 25, 2012 · 53d8c82 · 53d8c82
1 parent 4569349
commit 53d8c82
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 33 deletions.
diff --git a/doomsday/tests/archive/archive.pro b/doomsday/tests/archive/archive.pro
@@ -7,14 +7,15 @@ SOURCES += main.cpp
 
 OTHER_FILES += hello.txt
 
-macx {
-    archived.files = test.zip hello.txt
-    archived.path = Contents/Resources
-
-    cfg.files = $$DENG_CONFIG_DIR/deng.de
-    cfg.path = Contents/Resources/config
+deployTest($$TARGET)
 
-    QMAKE_BUNDLE_DATA += archived cfg
+archived.files = test.zip hello.txt
+archived.path = $$DENG_DATA_DIR
 
-    macDeployTest($$TARGET)
+macx {
+    archived.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += archived
+}
+else {
+    INSTALLS += archived
 }
diff --git a/doomsday/tests/config_test.pri b/doomsday/tests/config_test.pri
@@ -1,8 +1,12 @@
 include(../config.pri)
 include(../dep_deng2.pri)
 
+cfg.files = $$DENG_CONFIG_DIR/deng.de
+
 macx {
-    defineTest(macDeployTest) {
+    cfg.path = Contents/Resources/config
+
+    defineTest(deployTest) {
         # Arg 1: target name (without .app)
         fwDir = \"$${OUT_PWD}/$${1}.app/Contents/Frameworks/\"
         doPostLink("rm -rf $$fwDir")
@@ -11,5 +15,28 @@ macx {
 
         # Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle.
         fixInstallName($${1}.app/Contents/MacOS/$${1}, libdeng2.2.dylib, ..)
+
+        QMAKE_BUNDLE_DATA += cfg
+        export(QMAKE_BUNDLE_DATA)
+    }
+}
+else:win32 {
+    CONFIG += console
+
+    target.path = $$DENG_BIN_DIR
+    cfg.path = $$DENG_DATA_DIR/config
+
+    defineTest(deployTest) {
+        INSTALLS += cfg target
+        export(INSTALLS)
+    }
+}
+else {
+    target.path = $$DENG_BIN_DIR
+    cfg.path = $$DENG_DATA_DIR/config
+
+    defineTest(deployTest) {
+        INSTALLS += cfg target
+        export(INSTALLS)
     }
 }
diff --git a/doomsday/tests/record/record.pro b/doomsday/tests/record/record.pro
@@ -5,11 +5,4 @@ TARGET = test_record
 
 SOURCES += main.cpp
 
-macx {
-    cfg.files = $$DENG_CONFIG_DIR/deng.de
-    cfg.path = Contents/Resources/config
-
-    QMAKE_BUNDLE_DATA += cfg
-
-    macDeployTest($$TARGET)
-}
+deployTest($$TARGET)
diff --git a/doomsday/tests/script/script.pro b/doomsday/tests/script/script.pro
@@ -9,14 +9,15 @@ SCRIPTS = kitchen_sink.de sections.de
 
 OTHER_FILES += $$SCRIPTS
 
-macx {
-    scripts.files = $$SCRIPTS
-    scripts.path = Contents/Resources
-
-    cfg.files = $$DENG_CONFIG_DIR/deng.de
-    cfg.path = Contents/Resources/config
+deployTest($$TARGET)
 
-    QMAKE_BUNDLE_DATA += scripts cfg
+scripts.files = $$SCRIPTS
+scripts.path  = $$DENG_DATA_DIR
 
-    macDeployTest($$TARGET)
+macx {
+    scripts.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += scripts
+}
+else {
+    INSTALLS += scripts
 }
diff --git a/doomsday/tests/vectors/vectors.pro b/doomsday/tests/vectors/vectors.pro
@@ -5,11 +5,4 @@ TARGET = test_vectors
 
 SOURCES += main.cpp
 
-macx {
-    cfg.files = $$DENG_CONFIG_DIR/deng.de
-    cfg.path = Contents/Resources/config
-
-    QMAKE_BUNDLE_DATA += cfg
-
-    macDeployTest($$TARGET)
-}
+deployTest($$TARGET)