reset for 2.4.12 testing

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13793 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 66 insertions, 56 deletions

diff --git a/camlibs/ptp2/TESTPLAN.ptp2 b/camlibs/ptp2/TESTPLAN.ptp2
index 1fb09a03c..836772cfe 100644
--- a/camlibs/ptp2/TESTPLAN.ptp2
+++ b/camlibs/ptp2/TESTPLAN.ptp2
@@ -3,87 +3,97 @@ Testplan ptp2 driver
 Canon Powershot series (currently: Powershot SX100IS)
 
 	--capture-image-and-download
-		- via SDRAM (capturetarget=0):				PASS
-		- via Card (capturetarget=1):				PASS
-		- Card configured, but not inserted (capturetarget=1)	PASS
+		- via SDRAM (capturetarget=0):				TODO
+		- via Card (capturetarget=1):				TODO
+		- Card configured, but not inserted (capturetarget=1)	TODO
 
 	--capture-image-and-download -F 3 -I 5
-		- via SDRAM (capturetarget=0):				PASS
-		- via Card (capturetarget=1):				PASS
-		- Card configured, but not inserted (capturetarget=1)	PASS
+		- via SDRAM (capturetarget=0):				TODO
+		- via Card (capturetarget=1):				TODO
+		- Card configured, but not inserted (capturetarget=1)	TODO
+
+        time gphoto2 --capture-image-and-download -F 5 -I 1
+                - via SDRAM (capturetarget=0)
+                        real    0m34.579s               2.4.11 baseline
+			real    0m19.720s		2.4.12
+
+                - via CARD (capturetarget=1)
+                        real    0m32.608s               2.4.11 baseline
+                        real    0m31.830s               2.4.12
+
 
 	--capture-preview
-		commandline tool					PASS
-		gtkam							PASS
-		mixed with --capture-image-and-download			PASS
+		commandline tool					TODO
+		gtkam							TODO
+		mixed with --capture-image-and-download			TODO
 
-	--capture-movie=10s						PASS
+	--capture-movie=10s						TODO
 
-	--list-config							PASS
-	"capture option"						PASS
+	--list-config							TODO
+	"capture option"						TODO
 		--get-config capture
 		--set-config capture=1
 		--get-config capture
 		--set-config capture=0
 		--get-config capture
-	"zoom" and /other/ config tree value				PASS
+	"zoom" and /other/ config tree value				TODO
 		--get-config zoom
 		--set-config zoom=20
 		--get-config zoom
 		--get-config d02a
 		--set-config d02a=10
 		--get-config d02a
-	"ownername" 							PASS
+	"ownername" 							TODO
 		--get-config ownername
 		--set-config ownername="Markus Meissner"
 		--get-config ownername
 		--set-config ownername="Marcus Meissner"
-	--get-config d402						PASS
+	--get-config d402						TODO
 		(no string settable for the SX100IS)
 
 
 Canon EOS series (currently: Canon EOS 1000D)
 	--capture-image-and-download
 		- via SDRAM (capturetarget=0)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
-			- RAW						PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
+			- RAW						TODO
 		- via Card (SD) (capturetarget=1)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
-			- RAW						PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
+			- RAW						TODO
 
         --capture-image-and-download -F 3 -I 5
 		- via SDRAM (capturetarget=0)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
 		- via Card (capturetarget=1)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
 
 	--capture-preview
-		commandline tool					PASS
-		gtkam							PASS
-		mixed with --capture-image-and-download			PASS
+		commandline tool					TODO
+		gtkam							TODO
+		mixed with --capture-image-and-download			TODO
 
-	--capture-movie=10s						PASS
+	--capture-movie=10s						TODO
 
 	--wait-event-and-download
-		- JPEG							PASS
+		- JPEG							TODO
 			--set-config capturetarget=0
 			--set-config capturetarget=1
-		- JPEG + RAW						PASS
+		- JPEG + RAW						TODO
 			--set-config capturetarget=0
 			--set-config capturetarget=1
 
-	--list-config							PASS
-	"imageformat"							PASS
+	--list-config							TODO
+	"imageformat"							TODO
 		--get-config imageformat=0
 		--get-config imageformat
 		--set-config imageformat=6
 		--get-config imageformat
 
-	"ownername"							PASS
+	"ownername"							TODO
 		--get-config ownername
 		--set-config ownername="Marcus Meissner"
 		--get-config ownername
@@ -92,47 +102,47 @@ Canon EOS series (currently: Canon EOS 1000D)
 Nikon DSLR series (currently: Nikon D90)
 	--capture-image-and-download
 		- via SDRAM (capturetarget=0)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
 		- via Card (SD) (capturetarget=1)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
 		- no SD card inserted, capturetarget=0
-			- JPEG						FAIL/IGNORE (correct error)
-			- JPEG + RAW 					FAIL/IGNORE (correct error)
+			- JPEG						TODO/IGNORE (correct error)
+			- JPEG + RAW 					TODO/IGNORE (correct error)
 
         --capture-image-and-download -F 3 -I 5
 		- via SDRAM (capturetarget=0)
-			- JPEG						PASS
-			- JPEG + RAW					PASS (but not in correct order, JPGs are behind/IGNORE)
+			- JPEG						TODO
+			- JPEG + RAW					TODO (but not in correct order, JPGs are behind/IGNORE)
 		- via Card (capturetarget=1)
-			- JPEG						PASS
-			- JPEG + RAW					PASS
+			- JPEG						TODO
+			- JPEG + RAW					TODO
 		- no SD card insert, capturetarget=0
-			- JPEG						FAIL/IGNORE (correct error)
-			- JPEG + RAW 					FAIL/IGNORE (correct error)
+			- JPEG						TODO/IGNORE (correct error)
+			- JPEG + RAW 					TODO/IGNORE (correct error)
 
 	--capture-preview
-		commandline tool					PASS/CHECK - First image is always plain white :(
-		gtkam							PASS/CHECK (but no image capture possible)
+		commandline tool					TODO/CHECK - First image is always plain white :(
+		gtkam							TODO/CHECK (but no image capture possible)
 		mixed with --capture-image-and-download	
-			- SDRAM mode					PASS
-			- Card mode					FAIL/IGNORE (returns PTP Device Busy)
+			- SDRAM mode					TODO
+			- Card mode					TODO/IGNORE (returns PTP Device Busy)
 
-	--capture-movie=10s						PASS
+	--capture-movie=10s						TODO
 
 	--wait-event-and-download
-		- JPEG							PASS
+		- JPEG							TODO
 			--set-config capturetarget=0
 			--set-config capturetarget=1
-		- JPEG + RAW						PASS
+		- JPEG + RAW						TODO
 			--set-config capturetarget=0
 			--set-config capturetarget=1
 
 
-	--list-config							PASS
+	--list-config							TODO
 
-	"imagecommentenable", also in /other/ tree			PASS
+	"imagecommentenable", also in /other/ tree			TODO
 		--get-config imagecommentenable
 		--set-config imagecommentenable=An
 		--get-config imagecommentenable
@@ -141,7 +151,7 @@ Nikon DSLR series (currently: Nikon D90)
 		--get-config d091
 		--set-config d091=1
 
-	"imagecomment" , also in /other/ tree				PASS
+	"imagecomment" , also in /other/ tree				TODO
 		--get-config imagecomment
 		--set-config imagecomment="Marcus Meissner"
 		--get-config imagecomment