Tests|OS X: Test deployment with Qt 5, failed assert in test_log

skyjake · Jan 14, 2014 · 6bb992b · 6bb992b
1 parent ccb1c89
commit 6bb992b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/doomsday/tests/config_test.pri b/doomsday/tests/config_test.pri
@@ -1,3 +1,6 @@
+# Let deployers know this is only a test app.
+CONFIG += deng_testapp
+
 include(../config.pri)
 include(../dep_deng2.pri)
 
@@ -9,12 +12,13 @@ macx {
     mod.path = Contents/Resources/modules
 
     defineTest(deployTest) {
-        # Arg 1: target name (without .app)
-        fwDir = \"$${OUT_PWD}/$${1}.app/Contents/Frameworks/\"
+        fwDir = \"$${OUT_PWD}/$${1}.app/Contents/Frameworks\"
+        # Quite a hack: directly use the client's Frameworks folder.
         doPostLink("rm -rf $$fwDir")
-        doPostLink("mkdir $$fwDir")
-        doPostLink("ln -s $$OUT_PWD/../../libdeng2/libdeng2.dylib $$fwDir/libdeng2.dylib")
-        doPostLink("ln -s $$OUT_PWD/../../libdeng2/libdeng2.2.dylib $$fwDir/libdeng2.2.dylib")
+        doPostLink("ln -s \"$$OUT_PWD/../../client/Doomsday.app/Contents/Frameworks\" $$fwDir")
+        #doPostLink("mkdir $$fwDir")
+        #doPostLink("ln -s $$OUT_PWD/../../libdeng2/libdeng2.dylib $$fwDir/libdeng2.dylib")
+        #doPostLink("ln -s $$OUT_PWD/../../libdeng2/libdeng2.2.dylib $$fwDir/libdeng2.2.dylib")
 
         # Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle.
         fixInstallName($${1}.app/Contents/MacOS/$${1}, libdeng2.2.dylib, ..)

diff --git a/doomsday/tests/test_glsandbox/test_glsandbox.pro b/doomsday/tests/test_glsandbox/test_glsandbox.pro
@@ -23,6 +23,7 @@ win32 {
     INSTALLS += gfx
 }
 else:macx {
+    linkBinaryToBundledLibdeng2($${TARGET}.app/Contents/MacOS/$${TARGET})
     linkBinaryToBundledLibdengGui($${TARGET}.app/Contents/MacOS/$${TARGET})
 
     gfx.path = Contents/Resources/graphics

diff --git a/doomsday/tests/test_log/main.cpp b/doomsday/tests/test_log/main.cpp
@@ -40,18 +40,20 @@ int main(int argc, char **argv)
             {
                 LogEntry::Level level = LogEntry::Level(i);
                 app.logFilter().setMinLevel(level);
-                LOG_AT_LEVEL(level, "Enabled level %s with dev:%b") << LogEntry::levelToText(level) << devMode;
+                LOG_AT_LEVEL(level, "Enabled level %s with dev:%b")
+                        << LogEntry::levelToText(level) << devMode;
 
                 for(int k = LogEntry::LowestLogLevel; k <= LogEntry::HighestLogLevel; ++k)
                 {
                     for(int d = 0; d < 2; ++d)
                     {
                         duint32 other = k | (d? LogEntry::Dev : 0);
-                        LOG_AT_LEVEL(other, "- (currently enabled %8s) entry at level %8s (context %3s): visible: %b")
+                        LOG_AT_LEVEL(other,
+                                     "- (currently enabled %8s) entry at level %8s (context %3s): visible: %b")
                                 << LogEntry::levelToText(level)
                                 << LogEntry::levelToText(other)
                                 << LogEntry::contextToText(other)
-                                << LogBuffer::appBuffer().isEnabled(LogEntry::Level(other));
+                                << LogBuffer::appBuffer().isEnabled(LogEntry::Generic | other);
                     }
                 }
             }