Skip to contentSkip to conversation

Fix "make clean"'s failure in case cpuset

PATCH In review Shi Weihua 3 participants 6 messages Jul 13, 2009 – Jul 14, 2009

lore
Share & tools
lore

Shi Weihua

author
#0 lore raw

PATCH 1/1 Fix "make clean"'s failure in case cpuset

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 <[email protected]>

---

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile +2 -1
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
@@ -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; \

------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#1 lore raw
Quoted 4 lines · Shi Weihua

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 <[email protected]>

Garret,

If this is safe and does not interfere with your patches, please check this in.

Regards--
Subrata

Quoted 8 lines

---
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

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile all:cpuset_syscall_test · line 15

Quoted 9 lines
testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile +2 -1
@@ -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; \

------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#2 lore raw
Quoted 21 lines · Subrata Modak
Quoted 4 lines · Shi Weihua

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 <[email protected]>

Garret,

If this is safe and does not interfere with your patches, please check this in.

Regards--
Subrata

Quoted 7 lines

---
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

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile        2009-07-13 12:24:01.000000000 -0400 renamed from testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile   2009-06-23 10:18:17.000000000 -0400 +0 -0
@@ -8,7 +8,8 @@ all:cpuset_syscall_test
  cpuset_syscall_test: %: %.o $(LIBOBJECTS)
Quoted 7 lines
Quoted 7 lines

 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.
Thanks,
-Garrett

------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#3 lore raw
Quoted 28 lines · Garrett Cooper
Quoted 26 lines · Subrata Modak
Quoted 4 lines · Shi Weihua

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 <[email protected]>

Garret,

If this is safe and does not interfere with your patches, please check this in.

Regards--
Subrata

Quoted 12 lines

---
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

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile        2009-07-13 12:24:01.000000000 -0400 renamed from testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile   2009-06-23 10:18:17.000000000 -0400 +0 -0
@@ -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)

Quoted 6 lines
Quoted 2 lines
Quoted 2 lines

 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 <[email protected]>

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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

author
#4 lore raw
Quoted 45 lines · Garrett Cooper
Quoted 27 lines · Garrett Cooper
Quoted 25 lines · Subrata Modak
Quoted 4 lines · Shi Weihua

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 <[email protected]>

Garret,

If this is safe and does not interfere with your patches, please check this in.

Regards--
Subrata

Quoted 12 lines

---
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

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile 2009-07-13 12:24:01.000000000 -0400 renamed from testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile 2009-06-23 10:18:17.000000000 -0400 +2 -1
@@ -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)
Quoted 5 lines
Quoted 2 lines

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile 2009-07-13 12:24:01.000000000 -0400 all:cpuset_syscall_test · line 15

Quoted 2 lines
testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile 2009-07-13 12:24:01.000000000 -0400 renamed from testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile 2009-06-23 10:18:17.000000000 -0400 +0 -0
 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!

Quoted 8 lines

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 <[email protected]>

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 <[email protected]>

---

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile +3 -2
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
@@ -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; \
Quoted 14 lines

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

Review line 14

Quoted 8 lines
(quoted diff) +1 -1
@@ -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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#5 lore raw
Quoted 79 lines · Shi Weihua
Quoted 45 lines · Garrett Cooper
Quoted 27 lines · Garrett Cooper
Quoted 25 lines · Subrata Modak
Quoted 4 lines · Shi Weihua

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 <[email protected]>

Garret,

If this is safe and does not interfere with your patches, please check this in.

Regards--
Subrata

Quoted 12 lines

---
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

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile        2009-07-13 12:24:01.000000000 -0400 renamed from testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile   2009-06-23 10:18:17.000000000 -0400 +0 -0
@@ -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)

Quoted 5 lines
Quoted 2 lines
Quoted 2 lines

 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!

Quoted 8 lines

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 <[email protected]>

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 <[email protected]>

---
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

testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile  2009-07-14 04:14:55.000000000 -0400 renamed from testcases/kernel/controllers/cpuset/cpuset_syscall_test/Makefile     2009-06-23 10:18:17.000000000 -0400 +2 -1
@@ -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)

Quoted 2 lines

 install:
       @set -e; \

Yeah... you're right.. bleh.
I'll commit this when I get home tonight :).
Thanks,
-Garrett

------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list