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.<span></span><br><br>On Tuesday, August 9, 2016, Zachary Turner <<a href="mailto:zturner@google.com">zturner@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">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.</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 9, 2016 at 8:26 PM Todd Fiala <<a href="javascript:_e(%7B%7D,'cvml','todd.fiala@gmail.com');" target="_blank">todd.fiala@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Maybe those tests aren't including test_common.h? Dunno.</div><div class="gmail_extra"></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Aug 9, 2016 at 8:25 PM, Todd Fiala <span dir="ltr"><<a href="javascript:_e(%7B%7D,'cvml','todd.fiala@gmail.com');" target="_blank">todd.fiala@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">No, sorry, it does not.<div><br></div><div>Each of those got undefined macro errors on macOS.</div><div><br></div><div>-Todd</div></div><div class="gmail_extra"><div><div><br><div class="gmail_quote">On Tue, Aug 9, 2016 at 7:18 PM, Zachary Turner <span dir="ltr"><<a href="javascript:_e(%7B%7D,'cvml','zturner@google.com');" target="_blank">zturner@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This will make the tests start failing again on Windows. I #defined these in test_common.h, it should work. Does it not?<div><div><br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 9, 2016 at 6:45 PM Todd Fiala via lldb-commits <<a href="javascript:_e(%7B%7D,'cvml','lldb-commits@lists.llvm.org');" target="_blank">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tfiala<br>
Date: Tue Aug 9 20:37:27 2016<br>
New Revision: 278197<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=278197&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=278197&view=rev</a><br>
Log:<br>
Undid LLVM macro usage in test suite test subject files.<br>
<br>
Modified:<br>
lldb/trunk/packages/Python/<wbr>lldbsuite/test/<wbr>functionalities/breakpoint/<wbr>cpp/main.cpp<br>
lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>diamond/main.cpp<br>
lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>virtual/main.cpp<br>
<br>
Modified: lldb/trunk/packages/Python/<wbr>lldbsuite/test/<wbr>functionalities/breakpoint/<wbr>cpp/main.cpp<br>
URL: <a href="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" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lldb/trunk/packages/<wbr>Python/lldbsuite/test/<wbr>functionalities/breakpoint/<wbr>cpp/main.cpp?rev=278197&r1=<wbr>278196&r2=278197&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lldb/trunk/packages/Python/<wbr>lldbsuite/test/<wbr>functionalities/breakpoint/<wbr>cpp/main.cpp (original)<br>
+++ lldb/trunk/packages/Python/<wbr>lldbsuite/test/<wbr>functionalities/breakpoint/<wbr>cpp/main.cpp Tue Aug 9 20:37:27 2016<br>
@@ -16,15 +16,15 @@ namespace a {<br>
~c();<br>
void func1()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
void func2()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
void func3()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
};<br>
<br>
@@ -39,11 +39,11 @@ namespace b {<br>
~c();<br>
void func1()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
void func3()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
};<br>
<br>
@@ -58,11 +58,11 @@ namespace c {<br>
~d() {}<br>
void func2()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
void func3()<br>
{<br>
- puts (LLVM_PRETTY_FUNCTION);<br>
+ puts (__PRETTY_FUNCTION__);<br>
}<br>
};<br>
}<br>
<br>
Modified: lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>diamond/main.cpp<br>
URL: <a href="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" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lldb/trunk/packages/<wbr>Python/lldbsuite/test/lang/<wbr>cpp/diamond/main.cpp?rev=<wbr>278197&r1=278196&r2=278197&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>diamond/main.cpp (original)<br>
+++ lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>diamond/main.cpp Tue Aug 9 20:37:27 2016<br>
@@ -17,7 +17,7 @@ public:<br>
virtual ~VBase() {}<br>
void Print()<br>
{<br>
- printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, LLVM_PRETTY_FUNCTION, &m_value, m_value);<br>
+ printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, __PRETTY_FUNCTION__, &m_value, m_value);<br>
}<br>
int m_value;<br>
};<br>
@@ -28,7 +28,7 @@ public:<br>
Derived1() {};<br>
void Print ()<br>
{<br>
- printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION);<br>
+ printf("%p: %s\n", this, __PRETTY_FUNCTION__);<br>
VBase::Print();<br>
}<br>
<br>
@@ -41,7 +41,7 @@ public:<br>
<br>
void Print ()<br>
{<br>
- printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION);<br>
+ printf("%p: %s\n", this, __PRETTY_FUNCTION__);<br>
VBase::Print();<br>
}<br>
};<br>
@@ -56,7 +56,7 @@ public:<br>
{<br>
printf("%p: %s \n%p: m_joiner1 = 0x%8.8x\n%p: m_joiner2 = 0x%8.8x\n",<br>
this,<br>
- LLVM_PRETTY_FUNCTION,<br>
+ __PRETTY_FUNCTION__,<br>
&m_joiner1,<br>
m_joiner1,<br>
&m_joiner2,<br>
<br>
Modified: lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>virtual/main.cpp<br>
URL: <a href="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" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lldb/trunk/packages/<wbr>Python/lldbsuite/test/lang/<wbr>cpp/virtual/main.cpp?rev=<wbr>278197&r1=278196&r2=278197&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>virtual/main.cpp (original)<br>
+++ lldb/trunk/packages/Python/<wbr>lldbsuite/test/lang/cpp/<wbr>virtual/main.cpp Tue Aug 9 20:37:27 2016<br>
@@ -10,17 +10,17 @@ public:<br>
<br>
virtual const char * a()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
<br>
virtual const char * b()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
<br>
virtual const char * c()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
protected:<br>
char m_pad;<br>
@@ -34,7 +34,7 @@ public:<br>
<br>
virtual const char * aa()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
<br>
protected:<br>
@@ -50,12 +50,12 @@ public:<br>
<br>
virtual const char * a()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
<br>
virtual const char * b()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
protected:<br>
char m_pad;<br>
@@ -70,7 +70,7 @@ public:<br>
<br>
virtual const char * a()<br>
{<br>
- return LLVM_PRETTY_FUNCTION;<br>
+ return __PRETTY_FUNCTION__;<br>
}<br>
protected:<br>
char m_pad;<br>
<br>
<br>
______________________________<wbr>_________________<br>
lldb-commits mailing list<br>
<a href="javascript:_e(%7B%7D,'cvml','lldb-commits@lists.llvm.org');" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/lldb-commits</a><br>
</blockquote></div>
</div></div></blockquote></div><br><br clear="all"><div><br></div></div></div><span><font color="#888888">-- <br><div data-smartmail="gmail_signature"><div dir="ltr">-Todd</div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div></div><div class="gmail_extra">-- <br><div data-smartmail="gmail_signature"><div dir="ltr">-Todd</div></div>
</div></blockquote></div>
</blockquote><br><br>-- <br><div dir="ltr">-Todd</div><br>