Rename the upload-ftp tool to "gatekeeper" and update symlinks

At this time, the tool still reports as "ftp-upload" in syslog.

diff --git a/upload-ftp-v1.2.pl b/gatekeeper.pl
similarity index 100%
rename from upload-ftp-v1.2.pl
rename to gatekeeper.pl

diff --git a/testsuite/upload.all/00_idle.exp b/testsuite/gatekeeper.all/00_idle.exp
similarity index 100%
rename from testsuite/upload.all/00_idle.exp
rename to testsuite/gatekeeper.all/00_idle.exp

diff --git a/testsuite/upload.all/01_loose.exp b/testsuite/gatekeeper.all/01_loose.exp
similarity index 100%
rename from testsuite/upload.all/01_loose.exp
rename to testsuite/gatekeeper.all/01_loose.exp

diff --git a/testsuite/upload.all/03_triplet.exp b/testsuite/gatekeeper.all/03_triplet.exp
similarity index 100%
rename from testsuite/upload.all/03_triplet.exp
rename to testsuite/gatekeeper.all/03_triplet.exp

diff --git a/testsuite/upload.all/11_am_cve.exp b/testsuite/gatekeeper.all/11_am_cve.exp
similarity index 100%
rename from testsuite/upload.all/11_am_cve.exp
rename to testsuite/gatekeeper.all/11_am_cve.exp

diff --git a/testsuite/lib/upload.exp b/testsuite/lib/gatekeeper.exp
similarity index 97%
rename from testsuite/lib/upload.exp
rename to testsuite/lib/gatekeeper.exp
index 5820beb8f5a9687eb64ca49b5e4b37eb199dafc3..6086cedef52962c10cabeb373d9af25417ff71ba 100644 (file)
--- a/testsuite/lib/upload.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set UPLOAD_TOOL [file join $srcdir upload-ftp-v1.2.pl]
+set GATEKEEPER_TOOL [file join $srcdir gatekeeper.pl]
 if { ! [info exists PERL] } { set PERL perl }
 if { ! [info exists CHECK_COVERAGE] } { set CHECK_COVERAGE no }
 
@@ -31,11 +31,11 @@ set TEST_BASE [file join \
 set TENV_STEM [file join $TEST_BASE tenv]
 
 # invoked by DejaGnu framework when a failure is recorded
-proc upload_count_failures { args } {
-    global upload_failure_count
-    incr upload_failure_count
+proc gatekeeper_count_failures { args } {
+    global gatekeeper_failure_count
+    incr gatekeeper_failure_count
 }
-set local_record_procs(fail) upload_count_failures
+set local_record_procs(fail) gatekeeper_count_failures
 
 proc put_file { file string } {
     set chan [open $file w]
@@ -61,16 +61,16 @@ proc new_test_environment { } {
     global TENV_STEM
     set name [new_work_area $TENV_STEM]
 
-    global upload_failure_count
-    set upload_failure_count 0
+    global gatekeeper_failure_count
+    set gatekeeper_failure_count 0
 
     make_test_environment $name
     return $name
 }
 proc close_test_environment { name } {
-    global upload_failure_count
+    global gatekeeper_failure_count
     # delete the environment iff no tests failed
-    if { $upload_failure_count == 0 } {
+    if { $gatekeeper_failure_count == 0 } {
        file delete -force -- $name
     }
 }
@@ -289,14 +289,14 @@ proc stop_test_services {} {
 
 proc run_upload_batch_test {} {
     global spawn_id
-    global UPLOAD_TOOL PERL CHECK_COVERAGE
+    global GATEKEEPER_TOOL PERL CHECK_COVERAGE
 
     # run test case
     set runcmd [list spawn]
     if { $CHECK_COVERAGE } {
        lappend runcmd $PERL -T -MDevel::Cover=-silent,1
     }
-    lappend runcmd $UPLOAD_TOOL --testing-this-script -s ftp
+    lappend runcmd $GATEKEEPER_TOOL --testing-this-script -s ftp
     eval $runcmd
     wait
 }
@@ -991,15 +991,15 @@ proc analyze_mail { base_dir name args } {
     $result "$name: expected mail produced to expected addresses"
 }
 
-proc upload_exit {} {
+proc gatekeeper_exit {} {
     # clean up test environment tree
     global TEST_BASE
     catch {file delete -- $TEST_BASE}
 }
-proc upload_version {} {
-    global UPLOAD_TOOL
+proc gatekeeper_version {} {
+    global GATEKEEPER_TOOL
 
-    exec -- $UPLOAD_TOOL --testing-this-script --version >@ stdout
+    exec -- $GATEKEEPER_TOOL --testing-this-script --version >@ stdout
 }
 
 #EOF

diff --git a/upload-alpha.pl b/upload-alpha.pl
index 2d585ea224b6783b64514566f9504e0e56f7d997..686b02ea4ac3a23f440618e0380750c00cb89cfa 120000 (symlink)
--- a/upload-alpha.pl
+++ b/upload-alpha.pl
@@ -1 +1 @@
-upload-ftp-v1.2.pl
\ No newline at end of file
+gatekeeper.pl
\ No newline at end of file

diff --git a/upload-distros.pl b/upload-distros.pl
index 2d585ea224b6783b64514566f9504e0e56f7d997..686b02ea4ac3a23f440618e0380750c00cb89cfa 120000 (symlink)
--- a/upload-distros.pl
+++ b/upload-distros.pl
@@ -1 +1 @@
-upload-ftp-v1.2.pl
\ No newline at end of file
+gatekeeper.pl
\ No newline at end of file

diff --git a/upload-ftp.pl b/upload-ftp.pl
index 2d585ea224b6783b64514566f9504e0e56f7d997..686b02ea4ac3a23f440618e0380750c00cb89cfa 120000 (symlink)
--- a/upload-ftp.pl
+++ b/upload-ftp.pl
@@ -1 +1 @@
-upload-ftp-v1.2.pl
\ No newline at end of file
+gatekeeper.pl
\ No newline at end of file