* set DB_USE_SSH allows to force ssh instead of putty

git-svn-id: trunk@14175 -

tests/Makefile

@@ -1657,8 +1657,13 @@ else
 	cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $(DB_TARGZ)
 endif
 endif
-uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
+ifndef DB_USE_SSH
 ifdef inWinDOS
+UsePutty=1
+endif
+endif
+uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
+ifdef UsePutty
 	pscp -load "[email protected]" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
 	plink -load "[email protected]" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
 else

tests/Makefile.fpc

@@ -417,8 +417,17 @@ else
 endif
 endif
 
-uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
+
+# Use Putty, unless we set DB_USE_SSH to force ssh usage
+# Useful for cygwin
+ifndef DB_USE_SSH
 ifdef inWinDOS
+UsePutty=1
+endif
+endif
+
+uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
+ifdef UsePutty
         pscp -load "[email protected]" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
         plink -load "[email protected]" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
 else