diff --git a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py --- a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py +++ b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py @@ -6,8 +6,6 @@ # #===----------------------------------------------------------------------===## -# XFAIL: LIBCXX-WINDOWS-FIXME - # Note: We prepend arguments with 'x' to avoid thinking there are too few # arguments in case an argument is an empty string. # RUN: %{python} %s x%S x%T x%{substitutions} diff --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py --- a/libcxx/utils/libcxx/test/dsl.py +++ b/libcxx/utils/libcxx/test/dsl.py @@ -95,6 +95,10 @@ res = ('', res.output, 127, None) (out, err, exitCode, timeoutInfo) = res + if platform.system() == 'Windows': + out = out.replace('\r\n', '\n') + err = err.replace('\r\n', '\n') + # TODO: As a temporary workaround until https://reviews.llvm.org/D81892 lands, manually # split any stderr output that is included in stdout. It shouldn't be there, but # the Lit internal shell conflates stderr and stdout.