diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2009-11-14 17:22:27 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2009-11-14 17:22:27 +0000 |
| commit | d82ee8020acedb51a42c6bdaee12c6bbecb0c0e4 (patch) | |
| tree | 2be1d9a7b883a021976d86db2e8ca41583e21f0d /tests | |
| parent | 5c4b95fd6bf10aa763a7ac13f2a4b396dd983a4e (diff) | |
| download | fpc-d82ee8020acedb51a42c6bdaee12c6bbecb0c0e4.tar.gz | |
* set DB_USE_SSH allows to force ssh instead of putty
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14175 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 7 | ||||
| -rw-r--r-- | tests/Makefile.fpc | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 06d000b32d..5d452ea375 100644 --- a/tests/Makefile +++ b/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 "fpc@www.freepascal.org" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA) plink -load "fpc@www.freepascal.org" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)" else diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc index 2313b310e7..94650ed352 100644 --- a/tests/Makefile.fpc +++ b/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 "fpc@www.freepascal.org" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA) plink -load "fpc@www.freepascal.org" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)" else |