That sounds fine. Feel free to give it a shot. I can have a look in the morning if it's broken again. I assumed initially that it was over-aggressive search and replace so I didn't bother to look at the details.
On Tuesday, August 9, 2016, Zachary Turner <ztur...@google.com> wrote: > Hmm, the common Makefile.rules configures it to be a force include from > the command line. It's possible this isn't being done with gcc or some > other compiler. I suppose I can change test_common.h to #define > __PRETTY_FUNCTION__ __FUNCSIG__ on windows which would also fix those tests. > > On Tue, Aug 9, 2016 at 8:26 PM Todd Fiala <todd.fi...@gmail.com > <javascript:_e(%7B%7D,'cvml','todd.fi...@gmail.com');>> wrote: > >> Maybe those tests aren't including test_common.h? Dunno. >> >> On Tue, Aug 9, 2016 at 8:25 PM, Todd Fiala <todd.fi...@gmail.com >> <javascript:_e(%7B%7D,'cvml','todd.fi...@gmail.com');>> wrote: >> >>> No, sorry, it does not. >>> >>> Each of those got undefined macro errors on macOS. >>> >>> -Todd >>> >>> On Tue, Aug 9, 2016 at 7:18 PM, Zachary Turner <ztur...@google.com >>> <javascript:_e(%7B%7D,'cvml','ztur...@google.com');>> wrote: >>> >>>> This will make the tests start failing again on Windows. I #defined >>>> these in test_common.h, it should work. Does it not? >>>> >>>> On Tue, Aug 9, 2016 at 6:45 PM Todd Fiala via lldb-commits < >>>> lldb-commits@lists.llvm.org >>>> <javascript:_e(%7B%7D,'cvml','lldb-commits@lists.llvm.org');>> wrote: >>>> >>>>> Author: tfiala >>>>> Date: Tue Aug 9 20:37:27 2016 >>>>> New Revision: 278197 >>>>> >>>>> URL: http://llvm.org/viewvc/llvm-project?rev=278197&view=rev >>>>> Log: >>>>> Undid LLVM macro usage in test suite test subject files. >>>>> >>>>> Modified: >>>>> lldb/trunk/packages/Python/lldbsuite/test/ >>>>> functionalities/breakpoint/cpp/main.cpp >>>>> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/ >>>>> diamond/main.cpp >>>>> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/ >>>>> virtual/main.cpp >>>>> >>>>> Modified: lldb/trunk/packages/Python/lldbsuite/test/ >>>>> functionalities/breakpoint/cpp/main.cpp >>>>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/ >>>>> Python/lldbsuite/test/functionalities/breakpoint/ >>>>> cpp/main.cpp?rev=278197&r1=278196&r2=278197&view=diff >>>>> ============================================================ >>>>> ================== >>>>> --- lldb/trunk/packages/Python/lldbsuite/test/ >>>>> functionalities/breakpoint/cpp/main.cpp (original) >>>>> +++ lldb/trunk/packages/Python/lldbsuite/test/ >>>>> functionalities/breakpoint/cpp/main.cpp Tue Aug 9 20:37:27 2016 >>>>> @@ -16,15 +16,15 @@ namespace a { >>>>> ~c(); >>>>> void func1() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> void func2() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> void func3() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> }; >>>>> >>>>> @@ -39,11 +39,11 @@ namespace b { >>>>> ~c(); >>>>> void func1() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> void func3() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> }; >>>>> >>>>> @@ -58,11 +58,11 @@ namespace c { >>>>> ~d() {} >>>>> void func2() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> void func3() >>>>> { >>>>> - puts (LLVM_PRETTY_FUNCTION); >>>>> + puts (__PRETTY_FUNCTION__); >>>>> } >>>>> }; >>>>> } >>>>> >>>>> Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/ >>>>> diamond/main.cpp >>>>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/ >>>>> Python/lldbsuite/test/lang/cpp/diamond/main.cpp?rev= >>>>> 278197&r1=278196&r2=278197&view=diff >>>>> ============================================================ >>>>> ================== >>>>> --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp >>>>> (original) >>>>> +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp >>>>> Tue Aug 9 20:37:27 2016 >>>>> @@ -17,7 +17,7 @@ public: >>>>> virtual ~VBase() {} >>>>> void Print() >>>>> { >>>>> - printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, >>>>> LLVM_PRETTY_FUNCTION, &m_value, m_value); >>>>> + printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, >>>>> __PRETTY_FUNCTION__, &m_value, m_value); >>>>> } >>>>> int m_value; >>>>> }; >>>>> @@ -28,7 +28,7 @@ public: >>>>> Derived1() {}; >>>>> void Print () >>>>> { >>>>> - printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION); >>>>> + printf("%p: %s\n", this, __PRETTY_FUNCTION__); >>>>> VBase::Print(); >>>>> } >>>>> >>>>> @@ -41,7 +41,7 @@ public: >>>>> >>>>> void Print () >>>>> { >>>>> - printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION); >>>>> + printf("%p: %s\n", this, __PRETTY_FUNCTION__); >>>>> VBase::Print(); >>>>> } >>>>> }; >>>>> @@ -56,7 +56,7 @@ public: >>>>> { >>>>> printf("%p: %s \n%p: m_joiner1 = 0x%8.8x\n%p: m_joiner2 = >>>>> 0x%8.8x\n", >>>>> this, >>>>> - LLVM_PRETTY_FUNCTION, >>>>> + __PRETTY_FUNCTION__, >>>>> &m_joiner1, >>>>> m_joiner1, >>>>> &m_joiner2, >>>>> >>>>> Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/ >>>>> virtual/main.cpp >>>>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/ >>>>> Python/lldbsuite/test/lang/cpp/virtual/main.cpp?rev= >>>>> 278197&r1=278196&r2=278197&view=diff >>>>> ============================================================ >>>>> ================== >>>>> --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp >>>>> (original) >>>>> +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp >>>>> Tue Aug 9 20:37:27 2016 >>>>> @@ -10,17 +10,17 @@ public: >>>>> >>>>> virtual const char * a() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> >>>>> virtual const char * b() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> >>>>> virtual const char * c() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> protected: >>>>> char m_pad; >>>>> @@ -34,7 +34,7 @@ public: >>>>> >>>>> virtual const char * aa() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> >>>>> protected: >>>>> @@ -50,12 +50,12 @@ public: >>>>> >>>>> virtual const char * a() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> >>>>> virtual const char * b() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> protected: >>>>> char m_pad; >>>>> @@ -70,7 +70,7 @@ public: >>>>> >>>>> virtual const char * a() >>>>> { >>>>> - return LLVM_PRETTY_FUNCTION; >>>>> + return __PRETTY_FUNCTION__; >>>>> } >>>>> protected: >>>>> char m_pad; >>>>> >>>>> >>>>> _______________________________________________ >>>>> lldb-commits mailing list >>>>> lldb-commits@lists.llvm.org >>>>> <javascript:_e(%7B%7D,'cvml','lldb-commits@lists.llvm.org');> >>>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits >>>>> >>>> >>> >>> >>> -- >>> -Todd >>> >> >> >> >> -- >> -Todd >> > -- -Todd
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
