On 02/24/2012 08:54 AM, Peng Haitao wrote: > > Cyril Hrubis said the following on 2012-2-24 0:28: >> Hi! >>> runfstests.sh is creating temporary directory, which could be easily done >>> withing the test itself by using tst_tmpdir(), So runfstests.sh should be >>> deleted. >> >> This patch doesn't apply as well, probably mangled by your mail cliend >> too. Please resend. >> > > Sorry:( > > I resend the patch of v2, please apply. > Thanks. > Still no luck with v2 :-(
$ git am -3 ~/Desktop/\[LTP\]\ \[PATCH\]\ aio02\:\ runfstests.sh\ should\ be\ deleted.eml Applying: aio02: runfstests.sh should be deleted Using index info to reconstruct a base tree... error: patch failed: runtest/io:1 error: runtest/io: patch does not apply error: patch failed: testcases/kernel/io/aio/aio02/Makefile:27 error: testcases/kernel/io/aio/aio02/Makefile: patch does not apply error: patch failed: testcases/kernel/io/aio/aio02/README:2 error: testcases/kernel/io/aio/aio02/README: patch does not apply error: patch failed: testcases/kernel/io/aio/aio02/aio_tio.c:17 error: testcases/kernel/io/aio/aio02/aio_tio.c: patch does not apply error: testcases/kernel/io/aio/aio02/cases/common.h: has been deleted/renamed error: patch failed: testcases/kernel/io/aio/aio02/main.c:23 error: testcases/kernel/io/aio/aio02/main.c: patch does not apply error: testcases/kernel/io/aio/aio02/runfstests.sh: has been deleted/renamed Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 aio02: runfstests.sh should be deleted When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
