Subrata Modak wrote:
> On Wed, 2009-03-04 at 17:37 +0100, Németh Márton wrote:
>> Cleanup the Makefiles for the user space part of the device-driver tests.
>> Add "make clean".
>>
>> Signed-off-by: Márton Németh <[email protected]>
>
> Thanks. But, i think you need to resend this:
>
> patching file testcases/kernel/device-drivers/agp/user_space/Makefile
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/device-drivers/agp/user_space/Makefile.rej
> patching file testcases/kernel/device-drivers/base/user_base/Makefile
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/device-drivers/base/user_base/Makefile.rej
> patching file
> testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile
> patching file testcases/kernel/device-drivers/pci/user_tpci/Makefile
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/device-drivers/pci/user_tpci/Makefile.rej
> patching file testcases/kernel/device-drivers/tbio/user_space/Makefile
> patching file testcases/kernel/device-drivers/usb/user_usb/Makefile
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/device-drivers/usb/user_usb/Makefile.rej
I don't understand why it fails for you it was working for me:
nma...@machine:/usr/src/ltp$ patch -p0
<../cleanup_device_driver_makefiles2.patch
patching file testcases/kernel/device-drivers/agp/user_space/Makefile
patching file testcases/kernel/device-drivers/base/user_base/Makefile
patching file
testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile
patching file testcases/kernel/device-drivers/pci/user_tpci/Makefile
patching file testcases/kernel/device-drivers/tbio/user_space/Makefile
patching file testcases/kernel/device-drivers/usb/user_usb/Makefile
$
Nevertheless, please find attached the same patch created with "diff" instead
of "cvs diff". I hope this will cleanly apply at your side, too.
Regards,
Márton Németh
diff -uprN ltp.orig/testcases/kernel/device-drivers/agp/user_space/Makefile ltp/testcases/kernel/device-drivers/agp/user_space/Makefile
--- ltp.orig/testcases/kernel/device-drivers/agp/user_space/Makefile 2009-02-26 07:29:47.000000000 +0100
+++ ltp/testcases/kernel/device-drivers/agp/user_space/Makefile 2009-03-20 07:24:02.000000000 +0100
@@ -1,8 +1,9 @@
-test_agp: tagp_ki.o user_tagp.o
- ${CC} tagp_ki.o user_tagp.o -o test_agp
-tagp_ki.o: tagp_ki.c
- ${CC} -c tagp_ki.c
+CFLAGS += -Wall
+OBJS = tagp_ki.o user_tagp.o
-user_tagp.o: user_tagp.c
- ${CC} -c user_tagp.c
+test_agp: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+clean:
+ rm -f $(OBJS) test_agp
diff -uprN ltp.orig/testcases/kernel/device-drivers/base/user_base/Makefile ltp/testcases/kernel/device-drivers/base/user_base/Makefile
--- ltp.orig/testcases/kernel/device-drivers/base/user_base/Makefile 2009-02-26 07:29:47.000000000 +0100
+++ ltp/testcases/kernel/device-drivers/base/user_base/Makefile 2009-03-20 07:24:02.000000000 +0100
@@ -1,11 +1,9 @@
-test_base: tbase_ki.o user_tbase.o
- ${CC} tbase_ki.o user_tbase.o -o test_base
-tbase_ki.o: tbase_ki.c
- ${CC} -c tbase_ki.c
+CFLAGS += -Wall
+OBJS = tbase_ki.o user_tbase.o
-user_tbase.o: user_tbase.c
- ${CC} -c user_tbase.c
+test_base: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
clean:
- rm -f *.o 2>/dev/null || true
+ rm -f $(OBJS) test_base
diff -uprN ltp.orig/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile ltp/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile
--- ltp.orig/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile 2009-02-26 07:29:47.000000000 +0100
+++ ltp/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile 2009-03-20 07:24:02.000000000 +0100
@@ -1,8 +1,9 @@
-test_mod: tmod_ki.o user_tmod.o
- ${CC} tmod_ki.o user_tmod.o -o test_mod
-tmod_ki.o: tmod_ki.c
- ${CC} -c tmod_ki.c
+CFLAGS += -Wall
+OBJS = tmod_ki.o user_tmod.o
-user_tmod.o: user_tmod.c
- ${CC} -c user_tmod.c
+test_mod: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+clean:
+ rm -f $(OBJS) test_mod
diff -uprN ltp.orig/testcases/kernel/device-drivers/pci/user_tpci/Makefile ltp/testcases/kernel/device-drivers/pci/user_tpci/Makefile
--- ltp.orig/testcases/kernel/device-drivers/pci/user_tpci/Makefile 2009-02-26 07:29:47.000000000 +0100
+++ ltp/testcases/kernel/device-drivers/pci/user_tpci/Makefile 2009-03-20 07:24:02.000000000 +0100
@@ -1,8 +1,9 @@
-test_pci: tpci_ki.o user_tpci.o
- ${CC} tpci_ki.o user_tpci.o -o test_pci
-tpci_ki.o: tpci_ki.c
- ${CC} -c tpci_ki.c
+CFLAGS += -Wall
+OBJS = tpci_ki.o user_tpci.o
-user_tpci.o: user_tpci.c
- ${CC} -c user_tpci.c
+test_pci: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+clean:
+ rm -f $(OBJS) test_pci
diff -uprN ltp.orig/testcases/kernel/device-drivers/tbio/user_space/Makefile ltp/testcases/kernel/device-drivers/tbio/user_space/Makefile
--- ltp.orig/testcases/kernel/device-drivers/tbio/user_space/Makefile 2009-02-26 07:29:47.000000000 +0100
+++ ltp/testcases/kernel/device-drivers/tbio/user_space/Makefile 2009-03-20 07:24:02.000000000 +0100
@@ -1,8 +1,9 @@
-test_bio: tbio_ki.o user_tbio.o
- ${CC} -g tbio_ki.o user_tbio.o -o test_bio
-tbio_ki.o: tbio_ki.c
- ${CC} -c -g tbio_ki.c
+CFLAGS += -O2 -Wall -Wextra -g
+OBJS = tbio_ki.o user_tbio.o
-user_tbio.o: user_tbio.c
- ${CC} -c -g user_tbio.c
+test_bio: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+clean:
+ rm -f $(OBJS) test_bio
diff -uprN ltp.orig/testcases/kernel/device-drivers/usb/user_usb/Makefile ltp/testcases/kernel/device-drivers/usb/user_usb/Makefile
--- ltp.orig/testcases/kernel/device-drivers/usb/user_usb/Makefile 2009-02-26 07:29:47.000000000 +0100
+++ ltp/testcases/kernel/device-drivers/usb/user_usb/Makefile 2009-03-20 07:24:02.000000000 +0100
@@ -1,8 +1,9 @@
-test_usb: tusb_ki.o user_tusb.o
- ${CC} tusb_ki.o user_tusb.o -o test_usb
-tusb_ki.o: tusb_ki.c
- ${CC} -c tusb_ki.c
+CFLAGS += -Wall
+OBJS = tusb_ki.o user_tusb.o
-user_tusb.o: user_tusb.c
- ${CC} -c user_tusb.c
+test_usb: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+clean:
+ rm -f $(OBJS) test_usb
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
