Re: [LTP] [PATCH] Fix "make clean"'s failure in case cpuset

[Shi Weihua <shiwh@cn.fujitsu.com>]

Garrett Cooper wrote:
> On Mon, Jul 13, 2009 at 9:57 AM, Garrett Cooper<yanegomi@gmail.com> wrote:
>> On Mon, Jul 13, 2009 at 1:22 AM, Subrata
>> Modak<subrata@linux.vnet.ibm.com> wrote:
>>> On Mon, 2009-07-13 at 16:15 +0800, Shi Weihua wrote:
>>>> In case cpuset, the file cpuset_syscall_test.o was not deleted after "make clean".
>>>> The following patch fixed this problem.
>>>>
>>>> Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
>>> Garret,
>>>
>>> If this is safe and does not interfere with your patches, please check
>>> this in.
>>>
>>> Regards--
>>> Subrata
>>>
>>>> ---
>>>> diff -urpN ltp-full-20090630.orig/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile ltp-full-20090630/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile
>>>> --- ltp-full-20090630.orig/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile   2009-06-23 10:18:17.000000000 -0400
>>>> +++ ltp-full-20090630/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile        2009-07-13 12:24:01.000000000 -0400
>>>> @@ -8,7 +8,8 @@ all:cpuset_syscall_test
>>>>  cpuset_syscall_test: %: %.o $(LIBOBJECTS)
>>>>
>>>>  clean:
>>>> -     rm -rf cpuset_syscall_test
>>>> +     rm -rf cpuset_syscall_test cpuset_syscall_test.o
>>>> +     rm -f $(LIBOBJECTS)
>>>>
>>>>  install:
>>>>       @set -e; \
>>    I wish I could say that's the only area that needs clean fixed,
>> but there are other spots in the tree that suffer from that issue too.
>>    I'll submit a quick diff with all of the problem children in an hour or so.
> 
> Actually, the damage is a lot less than expected ;).
> 
> gcooper@orangebox /scratch/ltp-dev2/ltp $ find | grep -v CVS | xargs
> file | egrep 'archive|ELF' | grep -v 'shell archive'
> gcooper@orangebox /scratch/ltp-dev2/ltp $
> 
> A patch to fix a minor leak, which will get redone with the Makefile
> changes I'm bringing in soon.
> 
> Thanks Shi for the heads up!
> 
> Here's the patch I'm committing, which cleans out all objects in
> testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile --
> not just $(LIBOBJECTS).
> 
> NOTE: This patch is for viewing only, as the tabs were turned into
> spaces when copied from xterm.
> 
> Signed-off-by: Garrett Cooper <yanegomi@gmail.com>

I tested your patch, but unfortunately it does not work successfully. ;-)
The file cpuset_syscall_test.o has not been deleted after "make clean".
I think "$(OBJECTS)" has not been defined definitely in this Makefile. 
Maybe you should to try my following patch which based on yours.

Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
---
diff -urpN ltp-full-20090630.orig/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile ltp-full-20090630/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile
--- ltp-full-20090630.orig/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile	2009-06-23 10:18:17.000000000 -0400
+++ ltp-full-20090630/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile	2009-07-14 04:14:55.000000000 -0400
@@ -1,4 +1,5 @@
-SRCS = $(wildcard *.sh)
+SRCS = $(wildcard *.c)
+OBJECTS=$(patsubst %.c,%.o,$(SRCS))
 
 LIBSRCS=$(wildcard ../cpuset_lib/*.c)
 LIBOBJECTS=$(patsubst %.c,%.o,$(LIBSRCS))
@@ -8,7 +9,7 @@ all:cpuset_syscall_test
 cpuset_syscall_test: %: %.o $(LIBOBJECTS)
 
 clean:
-	rm -rf cpuset_syscall_test
+	rm -rf cpuset_syscall_test $(OBJECTS) $(LIBOBJECTS)
 
 install:
 	@set -e; \

> 
> Index: testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile
> ===================================================================
> RCS file: /cvsroot/ltp/ltp/testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile
> --- testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile
>  23 Jun 2009 14:18:17 -0000      1.3
> +++ testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile
>  13 Jul 2009 18:08:26 -0000
> @@ -8,7 +8,7 @@
>  cpuset_syscall_test: %: %.o $(LIBOBJECTS)
> 
>  clean:
> -       rm -rf cpuset_syscall_test
> +       rm -rf cpuset_syscall_test $(OBJECTS) $(LIBOBJECTS)
> 
>  install:
>         @set -e; \
> 
> 
> 


------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge  
This is your chance to win up to $100,000 in prizes! For a limited time, 
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize  
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list