Fix handling of flat dSYM output and greatly expand test coverage.

If flat dSYM output was requested, the generated dwarf files would be
placed next to the associated executable or bundle wrapper with a .dSYM
extension appended. Now, the dwarf files will be placed next to the
associated executable (which itself might be within a bundle) with a
.dwarf extension.

This follows the default behavior of dsymutil when no output file is
explicitly specified.

Change-Id: Iba71d4fe43b7415d33a244728ed8bce515270583
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

1 files changed, 73 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/separate-debug-info/project.qbs b/tests/auto/blackbox/testdata/separate-debug-info/project.qbs
index 0939f7227..c0498df3d 100644
--- a/tests/auto/blackbox/testdata/separate-debug-info/project.qbs
+++ b/tests/auto/blackbox/testdata/separate-debug-info/project.qbs
@@ -20,6 +20,7 @@ Project {
         files: ["foo.cpp"]
         cpp.separateDebugInformation: true
     }
+
     CppApplication {
         name: "app2"
         type: ["application"]
@@ -39,4 +40,76 @@ Project {
         files: ["foo.cpp"]
         cpp.separateDebugInformation: false
     }
+
+    CppApplication {
+        name: "app3"
+        type: ["application"]
+        files: ["main.cpp"]
+        cpp.separateDebugInformation: true
+        cpp.dsymutilFlags: ["--flat"]
+    }
+    DynamicLibrary {
+        Depends { name: "cpp" }
+        name: "foo3"
+        type: ["dynamiclibrary"]
+        files: ["foo.cpp"]
+        cpp.separateDebugInformation: true
+        cpp.dsymutilFlags: ["--flat"]
+    }
+    LoadableModule {
+        Depends { name: "cpp" }
+        name: "bar3"
+        files: ["foo.cpp"]
+        cpp.separateDebugInformation: true
+        cpp.dsymutilFlags: ["--flat"]
+    }
+
+    CppApplication {
+        name: "app4"
+        type: ["application"]
+        files: ["main.cpp"]
+        bundle.isBundle: false
+        cpp.separateDebugInformation: true
+    }
+    DynamicLibrary {
+        Depends { name: "cpp" }
+        name: "foo4"
+        type: ["dynamiclibrary"]
+        files: ["foo.cpp"]
+        bundle.isBundle: false
+        cpp.separateDebugInformation: true
+    }
+    LoadableModule {
+        Depends { name: "cpp" }
+        name: "bar4"
+        files: ["foo.cpp"]
+        bundle.isBundle: false
+        cpp.separateDebugInformation: true
+    }
+
+    CppApplication {
+        name: "app5"
+        type: ["application"]
+        files: ["main.cpp"]
+        bundle.isBundle: false
+        cpp.separateDebugInformation: true
+        cpp.dsymutilFlags: ["--flat"]
+    }
+    DynamicLibrary {
+        Depends { name: "cpp" }
+        name: "foo5"
+        type: ["dynamiclibrary"]
+        files: ["foo.cpp"]
+        bundle.isBundle: false
+        cpp.separateDebugInformation: true
+        cpp.dsymutilFlags: ["--flat"]
+    }
+    LoadableModule {
+        Depends { name: "cpp" }
+        name: "bar5"
+        files: ["foo.cpp"]
+        bundle.isBundle: false
+        cpp.separateDebugInformation: true
+        cpp.dsymutilFlags: ["--flat"]
+    }
 }