summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2012-06-03 18:22:50 +0000
committerMarcus Meissner <marcus@jet.franken.de>2012-06-03 18:22:50 +0000
commite29e45b8f8669915b7b1a5a2059c58d0fa17efc2 (patch)
tree0b1481a1f19164bffb8d33445e51034e40928e86
parent191ffd36b80062586c721bcb6d388d4488c2bd87 (diff)
downloadlibgphoto2-e29e45b8f8669915b7b1a5a2059c58d0fa17efc2.tar.gz
some test fixes for trunk
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14034 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/ptp2/test-nikon-d90.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/camlibs/ptp2/test-nikon-d90.sh b/camlibs/ptp2/test-nikon-d90.sh
index 1367de7e1..9b27456b9 100644
--- a/camlibs/ptp2/test-nikon-d90.sh
+++ b/camlibs/ptp2/test-nikon-d90.sh
@@ -42,18 +42,18 @@ gphoto2 --set-config capturetarget=1
time gphoto2 --set-config imagequality=2 --capture-image-and-download
echo "*** testing preview"
-rm preview.jpg || true
+rm capture_preview.jpg || true
gphoto2 --capture-preview
-gwenview preview.jpg
-rm preview.jpg || true
+gwenview capture_preview.jpg
+rm capture_preview.jpg || true
gphoto2 --set-config capturetarget=0
gphoto2 --capture-preview --capture-image-and-download --capture-preview --capture-image-and-download
rm capt*.*
-gwenview preview.jpg
+gwenview capture_preview.jpg
gphoto2 --set-config capturetarget=1
gphoto2 --capture-preview --capture-image-and-download --capture-preview --capture-image-and-download
-gwenview preview.jpg
-rm preview.jpg
+gwenview capture_preview.jpg
+rm capture_preview.jpg
rm movie.mjpg || true
gphoto2 --capture-movie=10s