<div dir="ltr"><div><div>It still wouldn't solve the underlying problem though; on FreeBSD this would fail to do anything:<br></div>rm -f file1 "" file2<br></div><div>(it's now fixed in SVN).<br><br></div>
<div>Although now that you mention it we should drop the -r from the invocations that aren't explicitly intended to handle directories - perhaps:<br><br>clean:: <br>
$(RM) "$(EXE)" $(OBJECTS) $(PREREQS) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS) <br> $(RM) -r *.d.[0-9] *.d.[0-9][0-9] *.d.[0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9][0-9]<br>ifneq "$(DYLIB_NAME)" "" <br>
$(RM) $(DYLIB_OBJECTS) $(DYLIB_PREREQS) $(DYLIB_FILENAME) $(DYLIB_FILENAME).dSYM $(DYLIB_FILENAME).debug<br>endif <br>ifneq "$(DSYM)" "" <br>
$(RM) "$(DSYM)" <br>endif <br><br><br></div></div><div class="gmail_extra">
<br><br><div class="gmail_quote">On 7 March 2014 12:34, Todd Fiala <span dir="ltr"><<a href="mailto:tfiala@google.com" target="_blank">tfiala@google.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">Isn't there a $(RM) rule that would have done effectively the rm -rf?</div><div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">On Fri, Mar 7, 2014 at 9:20 AM, Ed Maste <span dir="ltr"><<a href="mailto:emaste@freebsd.org" target="_blank">emaste@freebsd.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: emaste<br>
Date: Fri Mar 7 11:20:50 2014<br>
New Revision: 203253<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=203253&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=203253&view=rev</a><br>
Log:<br>
Fix test 'make clean' target for empty $(DSYM) on FreeBSD<br>
<br>
A freebsd issue with rm prevents '[g]make clean' from working if $(DSYM)<br>
is empty (fts_open(3) fails if passed an empty argument).<br>
<br>
To work around this, simplify the clean target by using three separate<br>
rm invocations: one for the common files, one for the case of non-empty<br>
$(DYLIB_NAME), and one for non-empty $(DSYM).<br>
<br>
Issue diagnosed (and reported to FreeBSD) by John Wolfe.<br>
<br>
<a href="http://llvm.org/pr17933" target="_blank">llvm.org/pr17933</a><br>
<br>
Modified:<br>
lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py<br>
lldb/trunk/test/make/Makefile.rules<br>
<br>
Modified: lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py?rev=203253&r1=203252&r2=203253&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py?rev=203253&r1=203252&r2=203253&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py (original)<br>
+++ lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py Fri Mar 7 11:20:50 2014<br>
@@ -21,7 +21,6 @@ class ChangedInferiorTestCase(TestBase):<br>
self.setTearDownCleanup(dictionary=d)<br>
self.inferior_not_crashing()<br>
<br>
- @expectedFailureFreeBSD('<a href="http://llvm.org/pr17933" target="_blank">llvm.org/pr17933</a>')<br>
def test_inferior_crashing_dwarf(self):<br>
"""Test lldb reloads the inferior after it was changed during the session."""<br>
self.buildDwarf()<br>
<br>
Modified: lldb/trunk/test/make/Makefile.rules<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=203253&r1=203252&r2=203253&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=203253&r1=203252&r2=203253&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/test/make/Makefile.rules (original)<br>
+++ lldb/trunk/test/make/Makefile.rules Fri Mar 7 11:20:50 2014<br>
@@ -363,11 +363,14 @@ endif<br>
dsym: $(DSYM)<br>
all: $(EXE) $(DSYM)<br>
clean::<br>
-ifeq "$(DYLIB_NAME)" ""<br>
- rm -rf "$(EXE)" "$(DSYM)" $(OBJECTS) $(PREREQS) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS) *.d.[0-9] *.d.[0-9][0-9] *.d.[0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9][0-9]<br>
-else<br>
- rm -rf "$(EXE)" "$(DSYM)" $(OBJECTS) $(PREREQS) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS) $(DYLIB_OBJECTS) $(DYLIB_PREREQS) $(DYLIB_FILENAME) $(DYLIB_FILENAME).dSYM $(DYLIB_FILENAME).debug *.d.[0-9] *.d.[0-9][0-9] *.d.[0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9][0-9]<br>
+ rm -rf "$(EXE)" $(OBJECTS) $(PREREQS) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS) *.d.[0-9] *.d.[0-9][0-9] *.d.[0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9] *.d.[0-9][0-9][0-9][0-9][0-9]<br>
+ifneq "$(DYLIB_NAME)" ""<br>
+ rm -rf $(DYLIB_OBJECTS) $(DYLIB_PREREQS) $(DYLIB_FILENAME) $(DYLIB_FILENAME).dSYM $(DYLIB_FILENAME).debug<br>
endif<br>
+ifneq "$(DSYM)" ""<br>
+ rm -rf "$(DSYM)"<br>
+endif<br>
+<br>
<br>
#----------------------------------------------------------------------<br>
# From <a href="http://blog.melski.net/tag/debugging-makefiles/" target="_blank">http://blog.melski.net/tag/debugging-makefiles/</a><br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br><div dir="ltr"><table style="color:rgb(136,136,136);font-family:'Times New Roman'" cellpadding="0" cellspacing="0">
<tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small">
<td style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px" nowrap>Todd Fiala |</td><td style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px" nowrap> Software Engineer |</td>
<td style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px" nowrap> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a> |</td>
<td style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px" nowrap><font color="#1155cc"> <a>650-943-3180</a></font></td></tr></tbody></table><br></div>
</font></span></div>
</blockquote></div><br></div>