[all-commits] [llvm/llvm-project] d7d818: Fix runInTerminal failures on Windows

[walter erquinigo via All-commits]

  Branch: refs/heads/release/12.x
  Home:   https://github.com/llvm/llvm-project
  Commit: d7d818c3615e4ff6bb283df0c1ddbb2b2cd50075
      https://github.com/llvm/llvm-project/commit/d7d818c3615e4ff6bb283df0c1ddbb2b2cd50075
  Author: Walter Erquinigo <a20012251 at gmail.com>
  Date:   2021-02-08 (Mon, 08 Feb 2021)

  Changed paths:
    M lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py
    M lldb/tools/lldb-vscode/FifoFiles.cpp
    M lldb/tools/lldb-vscode/FifoFiles.h
    M lldb/tools/lldb-vscode/lldb-vscode.cpp

  Log Message:
  -----------
  Fix runInTerminal failures on Windows

stella.stemenova mentioned in https://reviews.llvm.org/D93951 failures on Windows for this test.

I'm fixing the macro definitions and disabling the tests for python
versions lower than 3.7. I'll figure out that actual issue with
python3.6 after the buildbots are fine again.

(cherry picked from commit ab5591e1d8f5abcfa9e75193d3e8a29087b61425)


  Commit: 27aff2aa2ade9d78d0081445eadacd5b5006143e
      https://github.com/llvm/llvm-project/commit/27aff2aa2ade9d78d0081445eadacd5b5006143e
  Author: Walter Erquinigo <a20012251 at gmail.com>
  Date:   2021-02-08 (Mon, 08 Feb 2021)

  Changed paths:
    M lldb/tools/lldb-vscode/IOStream.cpp
    M lldb/tools/lldb-vscode/IOStream.h
    M lldb/tools/lldb-vscode/RunInTerminal.cpp
    M lldb/tools/lldb-vscode/VSCode.cpp
    M lldb/tools/lldb-vscode/VSCode.h
    M lldb/tools/lldb-vscode/lldb-vscode.cpp

  Log Message:
  -----------
  Fix lldb-vscode builds on Windows targeting POSIX

@stella.stamenova found out that lldb-vscode's Win32 macros were failing
when building on windows targetings POSIX platforms.

I'm changing these macros for LLVM_ON_UNIX, which should be more
accurate.

(cherry picked from commit 0bca9a7ce2eeaa9f1d732ffbc17769560a2b236e)


  Commit: 1cb6551edb94eea1fc087b346b1e8d13775dc692
      https://github.com/llvm/llvm-project/commit/1cb6551edb94eea1fc087b346b1e8d13775dc692
  Author: Walter Erquinigo <a20012251 at gmail.com>
  Date:   2021-02-08 (Mon, 08 Feb 2021)

  Changed paths:
    M lldb/tools/lldb-vscode/FifoFiles.cpp
    M lldb/tools/lldb-vscode/IOStream.cpp
    M lldb/tools/lldb-vscode/IOStream.h
    M lldb/tools/lldb-vscode/RunInTerminal.cpp
    M lldb/tools/lldb-vscode/VSCode.cpp
    M lldb/tools/lldb-vscode/lldb-vscode.cpp

  Log Message:
  -----------
  [lldb-vscode] correctly use Windows macros

@mstorsjo found a mistake that I made when trying to fix some Windows
compilation errors encountered by @stella.stamenova.

I was incorrectly using the LLVM_ON_UNIX macro. In any case, proper use
of

  #if defined(_WIN32)

should be the actual fix.

Differential Revision: https://reviews.llvm.org/D96060

(cherry picked from commit 36496cc2992d6fa26e6024971efcfc7d15f69888)


Compare: https://github.com/llvm/llvm-project/compare/251f3295b498...1cb6551edb94