[libcxx-commits] [PATCH] D77190: [libc++abi] Fix remote execution of .sh.cpp tests

Sergej Jaskiewicz via Phabricator via libcxx-commits libcxx-commits at lists.llvm.org
Tue Mar 31 18:12:54 PDT 2020

broadwaylamb created this revision.
broadwaylamb added a reviewer: ldionne.
Herald added subscribers: libcxx-commits, danielkiss, dexonsmith, kristof.beyls.
Herald added projects: libc++, libc++abi.
Herald added a reviewer: libc++.
Herald added a reviewer: libc++abi.
broadwaylamb marked 2 inline comments as done.
broadwaylamb added inline comments.

Comment at: libcxx/utils/ssh.py:73
     if exe:
-        exe = os.path.join(tmp, os.path.basename(exe))
+        exe = posixpath.join(tmp, os.path.basename(exe))
We're dealing with target-specific paths here. For now assume that the target uses POSIX paths.

Comment at: libcxxabi/test/incomplete_type.sh.cpp:25
 // RUN: %{cxx} %{flags} %{compile_flags} -c %s -o %t.two.o -DTU_ONE
-// RUN: %{cxx} %{flags} %t.one.o %t.two.o -lc++abi %{link_flags} -o %t.exe
-// RUN: %t.exe
+// RUN: %{cxx} %{flags} %t.one.o %t.two.o %{link_libcxxabi} %{link_flags} -o %t.exe
+// RUN: %{run}
We need this because if both static and shared libc++abi are present, the linker will prefer the shared one. And if we're running this test viaSSH, we want to link it statically.

This aims to fix test failures on the following buildbots:

- http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l
- http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64

  rG LLVM Github Monorepo



-------------- next part --------------
A non-text attachment was scrubbed...
Name: D77190.254069.patch
Type: text/x-patch
Size: 4670 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200401/a6ebab9c/attachment.bin>

More information about the libcxx-commits mailing list