From fa7ff81054faf1c147bf8776ab23dba9fde45c86 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Wed, 5 Oct 2022 20:40:40 -0500 Subject: [PATCH] Rename the upload-ftp tool to "gatekeeper" and update symlinks At this time, the tool still reports as "ftp-upload" in syslog. --- upload-ftp-v1.2.pl => gatekeeper.pl | 0 .../00_idle.exp | 0 .../01_loose.exp | 0 .../03_triplet.exp | 0 .../11_am_cve.exp | 0 testsuite/lib/{upload.exp => gatekeeper.exp} | 30 +++++++++---------- upload-alpha.pl | 2 +- upload-distros.pl | 2 +- upload-ftp.pl | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) rename upload-ftp-v1.2.pl => gatekeeper.pl (100%) rename testsuite/{upload.all => gatekeeper.all}/00_idle.exp (100%) rename testsuite/{upload.all => gatekeeper.all}/01_loose.exp (100%) rename testsuite/{upload.all => gatekeeper.all}/03_triplet.exp (100%) rename testsuite/{upload.all => gatekeeper.all}/11_am_cve.exp (100%) rename testsuite/lib/{upload.exp => gatekeeper.exp} (97%) 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 5820beb..6086ced 100644 --- 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 . -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 2d585ea..686b02e 120000 --- 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 2d585ea..686b02e 120000 --- 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 2d585ea..686b02e 120000 --- 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 -- 2.25.1