Fix mach-o tests on Windows

[ruiu]

Summary

The tests assume the path separator is '/', but if you run
them on Windows it is '\'. As a result the tests are failing
on Windows. This should be the minimal change to make these
tests to pass on Windows platform.

[t.p.northover]

Oh bother. Sorry about that. And very sorry for taking so long to reply too.

I think this looks reasonable. A bit fragile, but mostly on the testing code path, so we can work around it if there ever is a problem.

Cheers.

Tim.

[ruiu]

Closed by commit rL214990 (authored by @ruiu).

lld/trunk/lib/Driver/DarwinLdDriver.cpp

 #include "llvm/Support/Host.h"
 #include "llvm/Support/MachO.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Signals.h"
 
+#include <algorithm>
 
 namespace {
 
 // Create enum with OPT_xxx values for each option in DarwinLdOptions.td
 enum {
   OPT_INVALID = 0,
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
                HELP, META) \
case OPT_INPUT:
       inputPath = arg->getValue();
       break;
     case OPT_l: {
       ErrorOr<StringRef> resolvedPath = ctx.searchLibrary(arg->getValue());
       if (!resolvedPath) {
         diagnostics << "Unable to find library -l" << arg->getValue() << "\n";
         return false;
       } else if (ctx.testingLibResolution()) {
-        diagnostics << "Found library " << resolvedPath.get() << '\n';
+       // Test may be running on Windows. Canonicalize the path
+       // separator to '/' to get consistent outputs for tests.
+       std::string path = resolvedPath.get();
+       std::replace(path.begin(), path.end(), '\\', '/');
+       diagnostics << "Found library " << path << '\n';
       }
       inputPath = resolvedPath.get();
       break;
     }
     }
     inputGraph->addInputElement(std::unique_ptr<InputElement>(
         new MachOFileNode(ctx, inputPath, globalWholeArchive)));
   }

lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp

 
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/MachO.h"
 #include "llvm/Support/Path.h"
 
+#include <algorithm>
+
 using lld::mach_o::ArchHandler;
 using namespace llvm::MachO;
 
 namespace lld {
 
 bool MachOLinkingContext::parsePackedVersion(StringRef str, uint32_t &result) {
   result = 0;
 

 }
 
 bool MachOLinkingContext::pathExists(StringRef path) const {
   if (!testingLibResolution())
     return llvm::sys::fs::exists(path.str());
 
   // Otherwise, we're in test mode: only files explicitly provided on the
   // command-line exist.
-  return _existingPaths.find(path) != _existingPaths.end();
+  std::string key = path.str();
+  std::replace(key.begin(), key.end(), '\\', '/');
+  return _existingPaths.find(key) != _existingPaths.end();
 }
 
 void MachOLinkingContext::addModifiedSearchDir(
     StringRef libPath, const StringRefVector &syslibRoots, bool isSystemPath) {
   bool addedModifiedPath = false;
 
   // Two cases to consider here:
   //   + If the last -syslibroot is "/", all of them are ignored (don't ask).
   //   + -syslibroot only applies to absolute paths.
   if (!syslibRoots.empty() && syslibRoots.back() != "/" &&
-      llvm::sys::path::is_absolute(libPath)) {
+      libPath.startswith("/")) {
     for (auto syslibRoot : syslibRoots) {
       SmallString<256> path(syslibRoot);
       llvm::sys::path::append(path, libPath);
       if (pathExists(path)) {
         _searchDirs.push_back(path.str().copy(_allocator));
         addedModifiedPath = true;
       }
     }