From b7131009fbf67e5ac6f1ce1db9e8ba9ab602454a Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Sat, 24 Mar 2007 01:01:28 +0000
Subject: Changed the test harness to attempt to gracefully shut down servers
 before resorting to the kill -9 hammer.

Added test harness infrastructure to support scp/sftp tests, using
OpenSSH as the server.
---
 tests/FILEFORMAT | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/FILEFORMAT')

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 56e2e3eba..8e3f6ce77 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -126,6 +126,8 @@ http
 http-ipv6
 https
 none
+scp
+sftp
 
 Give only one per line.  This subsection is mandatory.
 </server>
@@ -212,9 +214,11 @@ Available substitute variables include:
 %FTP2PORT  - Port number of the FTP server 2
 %TFTPPORT  - Port number of the TFTP server
 %TFTP6PORT - IPv6 port number of the TFTP server
+%SSHPORT   - Port number of the SCP/SFTP server
 %SRCDIR    - Full path to the source dir
 %PWD       - Current directory
 %CURL      - Path to the curl executable
+%USER      - Login ID of the user running the test
 </command>
 
 <file name="log/filename">
-- 
cgit v1.2.3