Mangle extensions in executable paths

server/src/Paths.cpp

@@ -98,6 +98,14 @@ namespace Paths {
         return result;
     }
 
+    std::string mangleExtensions(const fs::path& path) {
+        if (!path.has_extension()) {
+            return path.string();
+        }
+        fs::path extension = path.extension();
+        return mangleExtensions(removeExtension(path)) + mangle(extension);
+    }
+
     fs::path subtractPath(std::string path1, std::string path2) {
         if (path2 == ".") {
             return path1;

server/src/Paths.h

@@ -124,6 +124,8 @@ namespace Paths {
 
     std::string mangle(const fs::path& path);
 
+    std::string mangleExtensions(const fs::path& path);
+
     static inline fs::path addOrigExtensionAsSuffixAndAddNew(const fs::path &path,
                                                              const std::string &newExt) {
         std::string extensionAsSuffix = path.extension().string();

server/src/clang-utils/SourceToHeaderMatchCallback.cpp

@@ -305,7 +305,7 @@ void SourceToHeaderMatchCallback::generateWrapper(const VarDecl *decl) const {
     policy.SuppressInitializers = 1;
 
     /*
-     * get_var_wrapper {
+     * get_pointer_to_var_wrapper {
      * return &var;
      * }
      */

server/src/printers/NativeMakefilePrinter.cpp

@@ -415,8 +415,8 @@ namespace printer {
         artifacts.push_back(getRelativePath(testExecutablePath));
     }
     fs::path NativeMakefilePrinter::getTestExecutablePath(const fs::path &sourcePath) const {
-        return Paths::removeExtension(
-            Paths::removeExtension(Paths::getRecompiledFile(testGen->projectContext, sourcePath)));
+        fs::path recompiledFile = Paths::getRecompiledFile(testGen->projectContext, sourcePath);
+        return Paths::mangleExtensions(recompiledFile);
     }
 
     NativeMakefilePrinter::NativeMakefilePrinter(const NativeMakefilePrinter &baseMakefilePrinter,

server/src/utils/PrinterUtils.cpp

@@ -23,7 +23,7 @@ namespace PrinterUtils {
     }
 
     std::string getterName(const std::string &wrapperName) {
-        return "get_" + wrapperName;
+        return "get_pointer_to_" + wrapperName;
     }
 
     std::string getterDecl(const std::string &returnTypeName,