[all-commits] [llvm/llvm-project] b30e42: [libcxx] [test] Avoid conflicting definitions of _...

[Martin Storsjö via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: b30e42922aeaeb70efbfcf7c2132dae21239a023
      https://github.com/llvm/llvm-project/commit/b30e42922aeaeb70efbfcf7c2132dae21239a023
  Author: Martin Storsjö <martin at martin.st>
  Date:   2020-10-20 (Tue, 20 Oct 2020)

  Changed paths:
    M libcxx/test/support/msvc_stdlib_force_include.h
    M libcxx/utils/libcxx/test/config.py

  Log Message:
  -----------
  [libcxx] [test] Avoid conflicting definitions of _CRT_SECURE_NO_WARNINGS

This is defined both by libcxx/utils/libcxx/test/config.py (for
any windows target) and msvc_stdlib_force_include.h (when testing
specifically the MSVC C++ library).

The command line define (-D_CRT_SECURE_NO_WARNINGS) defines it to the
value 1; change the header define to match that.

Keeping both instances, to keep the fix for cases when not building
in cases that don't use config.py.

Also remove a comment about whether this can be removed; it can't at
least be removed altogether - doing that breaks a number of tests that
otherwise succeed.

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


  Commit: 87d7c0009265951f988ea551203500ccfa141b15
      https://github.com/llvm/llvm-project/commit/87d7c0009265951f988ea551203500ccfa141b15
  Author: Martin Storsjö <martin at martin.st>
  Date:   2020-10-20 (Tue, 20 Oct 2020)

  Changed paths:
    M libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/make_preferred.pass.cpp

  Log Message:
  -----------
  [libcxx] [test] Fix path.modifiers/make_preferred for windows

Use p.string() instead of p.native() for comparing with the expected
value.

Explicitly list the expected values for both posix and windos, even if
the operation is an identity operation on posix.

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


Compare: https://github.com/llvm/llvm-project/compare/38b632c16e0f...87d7c0009265