From 7f35e060fd70195efdd552244dcc10947405fb7a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 10 Mar 2020 16:57:55 +0100 Subject: [PATCH 1/5] Remove unused test directories --- gram/jobmanager/auditing/test/Makefile.am | 29 -- gram/jobmanager/auditing/test/TESTS.pl | 36 -- gram/jobmanager/auditing/test/b38b4d8c.0 | 17 - .../auditing/test/b38b4d8c.signing_policy | 9 - gram/jobmanager/auditing/test/configure.in | 26 -- gram/jobmanager/auditing/test/dirt.sh.in | 2 - ...manager-auditing-job-submission-test.pl.in | 81 ---- ...ager-auditing-tg-job-submission-test.pl.in | 99 ---- ...ob-manager-auditing-upload-failure-test.pl | 105 ----- ...ob-manager-auditing-upload-success-test.pl | 54 --- .../jobmanager/auditing/test/jobs/Makefile.am | 10 - .../test/jobs/job-with-backticks.rsl.in | 2 - .../auditing/test/jobs/job-with-quotes.rsl.in | 2 - .../test/jobs/job-with-single-quotes.rsl.in | 2 - .../auditing/test/jobs/simple-job.rsl.in | 1 - .../perl_modules/ConfigurationManager.pm.in | 147 ------ .../test/perl_modules/GatekeeperManager.pm | 43 -- .../auditing/test/perl_modules/Makefile.am | 16 - .../auditing/test/perl_modules/Uploader.pm.in | 85 ---- .../auditing/test/perl_modules/Util.pm | 23 - .../auditing/test/records/Makefile.am | 12 - .../invalid-queued-timestamp.gramaudit.in | 1 - .../non-existing-username.gramaudit.in | 1 - .../auditing/test/records/ok.gramaudit.in | 1 - .../test/records/too-few-fields.gramaudit.in | 1 - gram/jobmanager/auditing/test/shibproxy.pem | 67 --- gram/jobmanager/auditing/test/testcert.pem | 14 - gram/jobmanager/auditing/test/testkey.pem | 15 - gram/jobmanager/auditing/test/testproxy.pem | 37 -- gram/jobmanager/lrms/fork/test/.gitignore | 5 - gram/jobmanager/lrms/fork/test/Makefile.am | 14 - .../lrms/fork/test/TESTS-junit.pl.in | 65 --- gram/jobmanager/lrms/fork/test/TESTS.pl.in | 43 -- gram/jobmanager/lrms/fork/test/configure.in | 19 - gram/jobmanager/lrms/fork/test/dirt.sh.in | 2 - gram/jobmanager/lrms/fork/test/seg/.gitignore | 5 - .../jobmanager/lrms/fork/test/seg/Makefile.am | 6 - .../lrms/fork/test/seg/test-fork-seg-data.txt | 136 ------ .../lrms/fork/test/seg/test-fork-seg.pl | 145 ------ gridftp/server/test/Makefile.am | 26 -- gridftp/server/test/configure.in | 24 - gridftp/server/test/dc31a685.0 | 16 - gridftp/server/test/dc31a685.signing_policy | 33 -- gridftp/server/test/dirt.sh.in | 2 - gridftp/server/test/gfork_be_conf.in | 18 - gridftp/server/test/gfork_conf.in | 17 - gridftp/server/test/gfork_mem_conf.in | 16 - gridftp/server/test/gfork_single_conf.in | 17 - gridftp/server/test/gfs_common.pl.in | 432 ------------------ .../server/test/globus-gridftp-be-gfork.pl.in | 239 ---------- .../server/test/globus-gridftp-dyn-be.pl.in | 232 ---------- .../server/test/globus-gridftp-gfork-fe.pl.in | 187 -------- .../test/globus-gridftp-gfork-mem.pl.in | 219 --------- gridftp/server/test/globus_gridftp_register.c | 136 ------ gridftp/server/test/testcred.pem | 39 -- gridftp/server/test/xio_ftp.c | 166 ------- 56 files changed, 3197 deletions(-) delete mode 100644 gram/jobmanager/auditing/test/Makefile.am delete mode 100755 gram/jobmanager/auditing/test/TESTS.pl delete mode 100644 gram/jobmanager/auditing/test/b38b4d8c.0 delete mode 100644 gram/jobmanager/auditing/test/b38b4d8c.signing_policy delete mode 100644 gram/jobmanager/auditing/test/configure.in delete mode 100644 gram/jobmanager/auditing/test/dirt.sh.in delete mode 100644 gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-job-submission-test.pl.in delete mode 100644 gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-tg-job-submission-test.pl.in delete mode 100755 gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-failure-test.pl delete mode 100755 gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-success-test.pl delete mode 100644 gram/jobmanager/auditing/test/jobs/Makefile.am delete mode 100644 gram/jobmanager/auditing/test/jobs/job-with-backticks.rsl.in delete mode 100644 gram/jobmanager/auditing/test/jobs/job-with-quotes.rsl.in delete mode 100644 gram/jobmanager/auditing/test/jobs/job-with-single-quotes.rsl.in delete mode 100644 gram/jobmanager/auditing/test/jobs/simple-job.rsl.in delete mode 100644 gram/jobmanager/auditing/test/perl_modules/ConfigurationManager.pm.in delete mode 100644 gram/jobmanager/auditing/test/perl_modules/GatekeeperManager.pm delete mode 100644 gram/jobmanager/auditing/test/perl_modules/Makefile.am delete mode 100644 gram/jobmanager/auditing/test/perl_modules/Uploader.pm.in delete mode 100644 gram/jobmanager/auditing/test/perl_modules/Util.pm delete mode 100644 gram/jobmanager/auditing/test/records/Makefile.am delete mode 100644 gram/jobmanager/auditing/test/records/invalid-queued-timestamp.gramaudit.in delete mode 100644 gram/jobmanager/auditing/test/records/non-existing-username.gramaudit.in delete mode 100644 gram/jobmanager/auditing/test/records/ok.gramaudit.in delete mode 100644 gram/jobmanager/auditing/test/records/too-few-fields.gramaudit.in delete mode 100644 gram/jobmanager/auditing/test/shibproxy.pem delete mode 100644 gram/jobmanager/auditing/test/testcert.pem delete mode 100644 gram/jobmanager/auditing/test/testkey.pem delete mode 100644 gram/jobmanager/auditing/test/testproxy.pem delete mode 100644 gram/jobmanager/lrms/fork/test/.gitignore delete mode 100644 gram/jobmanager/lrms/fork/test/Makefile.am delete mode 100644 gram/jobmanager/lrms/fork/test/TESTS-junit.pl.in delete mode 100644 gram/jobmanager/lrms/fork/test/TESTS.pl.in delete mode 100644 gram/jobmanager/lrms/fork/test/configure.in delete mode 100644 gram/jobmanager/lrms/fork/test/dirt.sh.in delete mode 100644 gram/jobmanager/lrms/fork/test/seg/.gitignore delete mode 100644 gram/jobmanager/lrms/fork/test/seg/Makefile.am delete mode 100644 gram/jobmanager/lrms/fork/test/seg/test-fork-seg-data.txt delete mode 100755 gram/jobmanager/lrms/fork/test/seg/test-fork-seg.pl delete mode 100644 gridftp/server/test/Makefile.am delete mode 100644 gridftp/server/test/configure.in delete mode 100644 gridftp/server/test/dc31a685.0 delete mode 100644 gridftp/server/test/dc31a685.signing_policy delete mode 100644 gridftp/server/test/dirt.sh.in delete mode 100644 gridftp/server/test/gfork_be_conf.in delete mode 100644 gridftp/server/test/gfork_conf.in delete mode 100644 gridftp/server/test/gfork_mem_conf.in delete mode 100644 gridftp/server/test/gfork_single_conf.in delete mode 100644 gridftp/server/test/gfs_common.pl.in delete mode 100644 gridftp/server/test/globus-gridftp-be-gfork.pl.in delete mode 100644 gridftp/server/test/globus-gridftp-dyn-be.pl.in delete mode 100644 gridftp/server/test/globus-gridftp-gfork-fe.pl.in delete mode 100644 gridftp/server/test/globus-gridftp-gfork-mem.pl.in delete mode 100644 gridftp/server/test/globus_gridftp_register.c delete mode 100644 gridftp/server/test/testcred.pem delete mode 100644 gridftp/server/test/xio_ftp.c diff --git a/gram/jobmanager/auditing/test/Makefile.am b/gram/jobmanager/auditing/test/Makefile.am deleted file mode 100644 index fc9600e1a2..0000000000 --- a/gram/jobmanager/auditing/test/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -SUBDIRS = records jobs perl_modules - -pkgtestdir = $(GLOBUS_LOCATION)/test/$(PACKAGE) - -Scripts = \ - TESTS.pl \ - globus-gram-job-manager-auditing-upload-success-test.pl \ - globus-gram-job-manager-auditing-upload-failure-test.pl - -GeneratedScripts = \ - globus-gram-job-manager-auditing-tg-job-submission-test.pl \ - globus-gram-job-manager-auditing-job-submission-test.pl - -GeneratedScriptsSources = \ - globus-gram-job-manager-auditing-tg-job-submission-test.pl.in \ - globus-gram-job-manager-auditing-job-submission-test.pl.in - -pkgtest_SCRIPTS = $(Scripts) $(GeneratedScripts) - -pkgtest_DATA = \ - testcert.pem \ - testkey.pem \ - b38b4d8c.0 \ - b38b4d8c.signing_policy \ - bootstrap \ - testproxy.pem \ - shibproxy.pem - -EXTRA_DIST = dirt.sh $(Scripts) $(GeneratedScriptsSources) $(pkgtest_DATA) diff --git a/gram/jobmanager/auditing/test/TESTS.pl b/gram/jobmanager/auditing/test/TESTS.pl deleted file mode 100755 index 1c9b24b9cd..0000000000 --- a/gram/jobmanager/auditing/test/TESTS.pl +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env perl - -BEGIN { - BEGIN { push(@INC, "./perl_modules"); } -} - -use strict; -use Test::Harness; -use ConfigurationManager; -use GatekeeperManager; -use Cwd; - -my $rc = 0; -my $stop_gatekeeper = 0; - -$ENV{X509_CERT_DIR} = cwd(); -$ENV{X509_USER_PROXY} = cwd() . "/testproxy.pem"; -system('chmod go-rw testproxy.pem'); - -my $cm = new ConfigurationManager(); -GatekeeperManager::startGatekeeper($cm->getAuditDir()); -$stop_gatekeeper = 1; - -my @tests = qw( - globus-gram-job-manager-auditing-job-submission-test.pl - globus-gram-job-manager-auditing-upload-success-test.pl - globus-gram-job-manager-auditing-tg-job-submission-test.pl - globus-gram-job-manager-auditing-upload-success-test.pl - globus-gram-job-manager-auditing-upload-failure-test.pl ); -runtests(@tests); - -exit (0 != $rc); - -END { - GatekeeperManager::stopGatekeeper(); -} diff --git a/gram/jobmanager/auditing/test/b38b4d8c.0 b/gram/jobmanager/auditing/test/b38b4d8c.0 deleted file mode 100644 index fc3a53f3ac..0000000000 --- a/gram/jobmanager/auditing/test/b38b4d8c.0 +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICtTCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQQFADBMMQswCQYDVQQGEwJVUzEY -MBYGA1UEChMPR2xvYnVzIEFsbGlhbmNlMSMwIQYDVQQDExpHbG9idXMgQ2VydGlm -aWNhdGUgU2VydmljZTAeFw0wMzA5MjkxNzI1NDhaFw0xMzA5MjYxNzI1NDhaMEwx -CzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HbG9idXMgQWxsaWFuY2UxIzAhBgNVBAMT -Gkdsb2J1cyBDZXJ0aWZpY2F0ZSBTZXJ2aWNlMIGfMA0GCSqGSIb3DQEBAQUAA4GN -ADCBiQKBgQDIAWpX+GngjO5ae8SNSDKRfOi4PvWV7iSjkXga3jyza55h6pFyCFbA -SyOtod4DWBoYYuSN6Dwu64taJNhDiwwHgPhFqw7bwAWA6qtOyL5nUIYbw1qee+sk -zMOuRL0YyNIx56yRkdxDIR7+DuLBPEBZhE3eFdZcRKB0J39r0ba4iwIDAQABo4Gm -MIGjMB0GA1UdDgQWBBQ+yRRfNptBthJ8mKBcDcfs+xEBUTB0BgNVHSMEbTBrgBQ+ -yRRfNptBthJ8mKBcDcfs+xEBUaFQpE4wTDELMAkGA1UEBhMCVVMxGDAWBgNVBAoT -D0dsb2J1cyBBbGxpYW5jZTEjMCEGA1UEAxMaR2xvYnVzIENlcnRpZmljYXRlIFNl -cnZpY2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAW5s+xnyW0 -BpKR0RnI1JeqdjAWvQrdTBVA51fTkNnxJepQ8XO4CDzDU7S41uT0hI/Md3OQIEAl -ciJ5YZE824/LWACVK1FYR5jWjmMY94fOwMLdYTOFNuCGrlHBP/ki0mCJDS2ad4aK -37mf0SHPXOVHrTZcT1TSpDJ0PNltDrRb7g== ------END CERTIFICATE----- diff --git a/gram/jobmanager/auditing/test/b38b4d8c.signing_policy b/gram/jobmanager/auditing/test/b38b4d8c.signing_policy deleted file mode 100644 index b5cb4d0a8e..0000000000 --- a/gram/jobmanager/auditing/test/b38b4d8c.signing_policy +++ /dev/null @@ -1,9 +0,0 @@ -#CL entry #1| - - access_id_CA X509 '/C=US/O=Globus Alliance/CN=Globus Certificate Service' - - pos_rights globus CA:sign - - cond_subjects globus '"/C=US/O=Globus Alliance/OU=Service/*" "/C=US/O=Globus Alliance/OU=User/*"' - -# end of EACL diff --git a/gram/jobmanager/auditing/test/configure.in b/gram/jobmanager/auditing/test/configure.in deleted file mode 100644 index 0a00c040df..0000000000 --- a/gram/jobmanager/auditing/test/configure.in +++ /dev/null @@ -1,26 +0,0 @@ -dnl - -AC_REVISION($Revision$) -AC_INIT(Makefile.am) - -GLOBUS_INIT - -AM_PROG_LIBTOOL - -dnl config header goes here - -dnl Initialize the automake rules the last argument -AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION) - -GLOBUS_FINALIZE - -AC_OUTPUT( - Makefile - globus-gram-job-manager-auditing-tg-job-submission-test.pl - globus-gram-job-manager-auditing-job-submission-test.pl - jobs/Makefile - records/Makefile - perl_modules/Makefile - perl_modules/ConfigurationManager.pm - perl_modules/Uploader.pm -) diff --git a/gram/jobmanager/auditing/test/dirt.sh.in b/gram/jobmanager/auditing/test/dirt.sh.in deleted file mode 100644 index f9787f7d31..0000000000 --- a/gram/jobmanager/auditing/test/dirt.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -DIRT_TIMESTAMP=@DIRT_TIMESTAMP@ -DIRT_BRANCH_ID=@DIRT_BRANCH_ID@ diff --git a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-job-submission-test.pl.in b/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-job-submission-test.pl.in deleted file mode 100644 index 5adf151898..0000000000 --- a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-job-submission-test.pl.in +++ /dev/null @@ -1,81 +0,0 @@ -#! /usr/bin/env perl - -BEGIN -{ - if (exists $ENV{GLOBUS_LOCATION}) - { - push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl"); - } - else - { - push(@INC, '@libdir@/perl'); - } - push(@INC, "./perl_modules"); -} - -print "1..1\n"; - -use strict; -use Cwd; -require 5.005; -use ConfigurationManager; -use Util; - -my $configurationManager = ConfigurationManager->new(); - -$ENV{X509_CERT_DIR} = cwd(); -$ENV{X509_USER_PROXY} = cwd() . "/testproxy.pem"; -system('chmod go-rw testproxy.pem'); - -# make sure the test audit directory is empty -$configurationManager->cleanupAuditDir(); - -# substitute variables -$configurationManager->replaceSubstitutionVars(); - -# get list of job files to be submitted -my @jobFiles = glob($configurationManager->getJobDir()."/*.rsl"); -my $numberOfJobs = @jobFiles; -if ($numberOfJobs == 0) { - print "not ok #No jobs to submit. Check job directory for *.rsl files\n"; - exit(0); -} - -# submit the jobs -foreach (@jobFiles) { my $command = "$Globus::Core::Paths::bindir/globusrun -s -r \"$ENV{CONTACT_STRING}\" -f $_"; - Util::debug("Submitting job: $command"); - `$command`; -} - -# check 30 seconds if the audit-record file that fits to the -# submitted job was created. If not assume that an error occured -my $foundRecords = 0; -my @auditRecordFiles; - -# check if an audit record file for each job was created -my $auditdir = $configurationManager->getAuditDir(); -Util::debug("Looking for $numberOfJobs audit record in $auditdir"); -for (my $i=0; $i<30; $i++) { - @auditRecordFiles = glob($auditdir."/*.gramaudit"); - my $count = @auditRecordFiles; - if ($count == $numberOfJobs) { - Util::debug("Found $count audit records"); - $foundRecords = 1; - last; - } elsif ($count > $numberOfJobs) { - print "not ok #Found $count audit records. That's too many\n"; - exit(0); - } else { - Util::debug("Found $count audit records"); - sleep(1); - } -} - -# if the audit-record file was not found -if (!$foundRecords) { - print "not ok #No audit record file per job created by Gram\n"; - exit(0); -} - -print "ok\n"; -exit(0); diff --git a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-tg-job-submission-test.pl.in b/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-tg-job-submission-test.pl.in deleted file mode 100644 index a40450eaf2..0000000000 --- a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-tg-job-submission-test.pl.in +++ /dev/null @@ -1,99 +0,0 @@ -#! /usr/bin/env perl - -BEGIN -{ - if (exists $ENV{GLOBUS_LOCATION}) - { - push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl"); - } - else - { - push(@INC, '@libdir@/perl'); - } - push(@INC, "./perl_modules"); -} - -print "1..1\n"; - -use strict; -use Cwd; -require 5.005; -use ConfigurationManager; -use Util; - -my $configurationManager = ConfigurationManager->new(); - -$ENV{X509_CERT_DIR} = cwd(); -$ENV{X509_USER_PROXY} = cwd() . "/shibproxy.pem"; -system('chmod go-rw shibproxy.pem'); - -# make sure the test audit directory is empty -$configurationManager->cleanupAuditDir(); - -# substitute variables -$configurationManager->replaceSubstitutionVars(); - -# get list of job files to be submitted -my @jobFiles = glob($configurationManager->getJobDir()."/*.rsl"); -my $numberOfJobs = @jobFiles; -if ($numberOfJobs == 0) { - print "not ok #No jobs to submit. Check job directory for *.rsl files\n"; - exit(0); -} - -# submit the jobs -foreach (@jobFiles) { my $command = "$Globus::Core::Paths::bindir/globusrun -s -r \"$ENV{CONTACT_STRING}\" -f $_"; - Util::debug("Submitting job: $command"); - `$command`; -} - -# check 30 seconds if the audit-record file that fits to the -# submitted job was created. If not assume that an error occured -my $foundRecords = 0; -my @auditRecordFiles; - -# check if an audit record file for each job was created -my $auditdir = $configurationManager->getAuditDir(); -Util::debug("Looking for $numberOfJobs audit record in $auditdir"); -for (my $i=0; $i<30; $i++) { - @auditRecordFiles = glob($auditdir."/*.gramaudit"); - my $count = @auditRecordFiles; - if ($count == $numberOfJobs) { - Util::debug("Found $count audit records"); - $foundRecords = 1; - last; - } elsif ($count > $numberOfJobs) { - print "not ok #Found $count audit records. That's too many\n"; - exit(0); - } else { - Util::debug("Found $count audit records"); - sleep(1); - } -} - -# if the audit-record file was not found -if (!$foundRecords) { - print "not ok #No audit record file per job created by Gram\n"; - exit(0); -} - -# Check that audit records contain the tg gateway username -foreach (glob($auditdir."/*.gramaudit")) { - my $file = $_; - my $line; - my $gateway_user; - - local(*F); - - open(F, "<$file"); - chomp($line = ); - - $gateway_user = (split(/,/, $line))[15]; - if ($gateway_user ne '"testuser@example.org"') { - print "not ok # gateway_user = $gateway_user\n"; - exit(0); - } -} - -print "ok\n"; -exit(0); diff --git a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-failure-test.pl b/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-failure-test.pl deleted file mode 100755 index 59114ecb33..0000000000 --- a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-failure-test.pl +++ /dev/null @@ -1,105 +0,0 @@ -#! /usr/bin/env perl - -BEGIN { push(@INC, "./perl_modules"); } - -use strict; -use ConfigurationManager; -use Uploader; -use Util; - -my $expectErrors; -my $expectedNumberLeftoverRecords; -my $configurationManager = ConfigurationManager->new(); -my $recorddir = $configurationManager->getRecordDir(); -my $auditdir = $configurationManager->getAuditDir(); -my $uploader = Uploader->new($auditdir); -my $backed_up = 0; -my %recordFiles = ( - "ok1" => $recorddir . "/ok.gramaudit", - "bad1" => $recorddir . "/too-few-fields.gramaudit", - "bad2" => $recorddir . "/invalid-queued-timestamp.gramaudit", - "bad3" => $recorddir . "/non-existing-username.gramaudit", -); - -print "1..1\n"; - -Util::debug("-- Trying 2 buggy records. expecting errors and 2 leftover files"); -$expectErrors = 1; -$expectedNumberLeftoverRecords = 2; -tryUpload($expectErrors, - $expectedNumberLeftoverRecords, - $configurationManager->getGoodConfiguration(), - ($recordFiles{"bad1"}, $recordFiles{"bad2"})); - -Util::debug("-- Trying 1 ok and 1 buggy record. expecting errors and 1 leftover file"); -$expectErrors = 1; -$expectedNumberLeftoverRecords = 1; -tryUpload( - $expectErrors, - $expectedNumberLeftoverRecords, - $configurationManager->getGoodConfiguration(), - ($recordFiles{"ok1"}, $recordFiles{"bad2"})); - -Util::debug("-- Trying 1 record where record file owner != local user id as defined in the record"); -$expectErrors = 1; -$expectedNumberLeftoverRecords = 1; -tryUpload( - $expectErrors, - $expectedNumberLeftoverRecords, - $configurationManager->getGoodConfiguration(), - ($recordFiles{"bad3"})); - -Util::debug("-- Trying invalid audit config"); -$expectErrors = 1; -$expectedNumberLeftoverRecords = 1; -tryUpload( - $expectErrors, - $expectedNumberLeftoverRecords, - $configurationManager->getBadConfiguration(), - ($recordFiles{"ok1"})); - -print "ok\n"; -exit(0); - -############################ Helper methods #################################### - -sub tryUpload { - - my $expectErrors = shift; - my $numberLeftoverRecords = shift; - my $conf = shift; - my @recordArray = @_; - my $numberOfRecords = @recordArray; - - # cleanup the audit directory - $configurationManager->cleanupAuditDir(); - - # make sure the test audit directory is empty - if (getNumberFilesInAuditDir() != 0) { - print "not ok #Audit directory not empty\n"; - exit(0); - } - - foreach(@recordArray) { - system("cp $_ $auditdir"); - } - - # make sure the test records are in place - if (getNumberFilesInAuditDir() != $numberOfRecords) { - print "not ok #Audit directory not empty\n"; - exit(0); - } - - if (!$uploader->loadGram2RecordsIntoDatabase($conf, $expectErrors, $numberLeftoverRecords)) { - print "not ok #Upload of record did not work as expected.\n"; - exit(0); - } -} - -# return the number of files in the audit directory -sub getNumberFilesInAuditDir { - - my @audit_record_files = glob($auditdir . "/*.gramaudit"); - my $count = @audit_record_files; - return $count; -} diff --git a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-success-test.pl b/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-success-test.pl deleted file mode 100755 index 2191382d73..0000000000 --- a/gram/jobmanager/auditing/test/globus-gram-job-manager-auditing-upload-success-test.pl +++ /dev/null @@ -1,54 +0,0 @@ -#! /usr/bin/env perl - -BEGIN { push(@INC, "./perl_modules"); } - -use strict; -use Uploader; -use Util; -use ConfigurationManager; - -my $configurationManager = ConfigurationManager->new(); -my $auditdir = $configurationManager->getAuditDir(); -my $uploader = Uploader->new($auditdir); -my $expectErrors = 0; -my $expectedNumberLeftoverRecords = 0; - -print "1..1\n"; - -# make sure the test audit directory is not empty. -# this test expects audit records from the submission test in the audit directory -my $numberOfRecords = getNumberFilesInAuditDir(); -if ($numberOfRecords == 0) { - fail("Expecting records in the audit directory from the " . - "submission test but didn't find any\n"); - exit(0); -} else { - Util::debug("Loading up $numberOfRecords audit records into the database"); -} - -if (!$uploader->loadGram2RecordsIntoDatabase( - $configurationManager->getGoodConfiguration(), - $expectErrors, - $expectedNumberLeftoverRecords)) { - fail ("Upload of record failed. This should have succeeded\n"); - exit(0); -} - -print "ok\n"; -exit(0); - -############################ Helper methods #################################### - -# return the number of files in the audit directory -sub getNumberFilesInAuditDir { - my @audit_record_files = - glob($auditdir . "/*.gramaudit"); - my $count = @audit_record_files; - return $count; -} - -sub fail { - my $reason = $_[0]; - print "not ok\n"; - print STDERR $reason; -} diff --git a/gram/jobmanager/auditing/test/jobs/Makefile.am b/gram/jobmanager/auditing/test/jobs/Makefile.am deleted file mode 100644 index d982e2f897..0000000000 --- a/gram/jobmanager/auditing/test/jobs/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -pkgtestdir = $(GLOBUS_LOCATION)/test/$(PACKAGE) -pkgdatadir = $(GLOBUS_LOCATION)/test/$(PACKAGE)/jobs - -pkgtest_SCRIPTS = -pkgdata_DATA = \ - job-with-backticks.rsl.in \ - job-with-quotes.rsl.in \ - job-with-single-quotes.rsl.in - -EXTRA_DIST = $(pkgdata_DATA) diff --git a/gram/jobmanager/auditing/test/jobs/job-with-backticks.rsl.in b/gram/jobmanager/auditing/test/jobs/job-with-backticks.rsl.in deleted file mode 100644 index 48bc2d7e91..0000000000 --- a/gram/jobmanager/auditing/test/jobs/job-with-backticks.rsl.in +++ /dev/null @@ -1,2 +0,0 @@ -&(executable = __EXE_ECHO__) - (arguments = "back-ticks like ` are useful") diff --git a/gram/jobmanager/auditing/test/jobs/job-with-quotes.rsl.in b/gram/jobmanager/auditing/test/jobs/job-with-quotes.rsl.in deleted file mode 100644 index 534b8f40ee..0000000000 --- a/gram/jobmanager/auditing/test/jobs/job-with-quotes.rsl.in +++ /dev/null @@ -1,2 +0,0 @@ -&(executable = __EXE_ECHO__) - (arguments = "double quotes \"\" should not break things") diff --git a/gram/jobmanager/auditing/test/jobs/job-with-single-quotes.rsl.in b/gram/jobmanager/auditing/test/jobs/job-with-single-quotes.rsl.in deleted file mode 100644 index 3d3f482637..0000000000 --- a/gram/jobmanager/auditing/test/jobs/job-with-single-quotes.rsl.in +++ /dev/null @@ -1,2 +0,0 @@ -&(executable = __EXE_ECHO__) - (arguments = "single quotes shouldn't break things") diff --git a/gram/jobmanager/auditing/test/jobs/simple-job.rsl.in b/gram/jobmanager/auditing/test/jobs/simple-job.rsl.in deleted file mode 100644 index 156f469587..0000000000 --- a/gram/jobmanager/auditing/test/jobs/simple-job.rsl.in +++ /dev/null @@ -1 +0,0 @@ -&(executable=__EXE_ECHO__) diff --git a/gram/jobmanager/auditing/test/perl_modules/ConfigurationManager.pm.in b/gram/jobmanager/auditing/test/perl_modules/ConfigurationManager.pm.in deleted file mode 100644 index 426ac57434..0000000000 --- a/gram/jobmanager/auditing/test/perl_modules/ConfigurationManager.pm.in +++ /dev/null @@ -1,147 +0,0 @@ -############################################################################### -# Handle configuration files. Involved in audit logging in gram2 are -# the following configuration files: -# * database configuration: -# the values to access the database are store in there -# * job manager configuration -# globus-gram-audit reads the audit directory from there -# -# For each of the test makes a backup of the existing configuration -# and replaces it with a test configuration. after the test is done the -# backup files are moved back in place -# - -package ConfigurationManager; - -@GLOBUS_PERL_INITIALIZER@ - -use Util; -use IO::File; -use File::Copy qw(copy); -use Globus::Core::Paths; -use strict; - -sub new { - - my $proto = shift; - my $self={}; - bless($self, $proto); - - $self->{'testdir'} = "$Globus::Core::Paths::prefix/test/globus_gram_job_manager_auditing_test"; - $self->{'jobdir'} = $self->{'testdir'} . "/jobs"; - $self->{'recorddir'} = $self->{'testdir'} . "/records"; - $self->{'configdir'} = $self->{'testdir'} . "/configuration"; - $self->{'auditdir'} = $self->{'testdir'} . "/audit_records"; - - # substitution variables in the test configuration files - $self->{'substVars'}->{'__GLOBUS_LOCATION__'} = "$Globus::Core::Paths::prefix"; - $self->{'substVars'}->{'__AUDIT_DATA_DIR__'} = $self->{'auditdir'}; - $self->{'substVars'}->{'__CURRENT_USER__'} = (getpwuid($>))[0]; - $self->{'substVars'}->{'__CURRENT_TIME__'} = scalar(localtime); - $self->{'substVars'}->{'__EXE_ECHO__'} = Util::trim(`which echo`); - - $self->{'conf'} = "$Globus::Core::Paths::sysconfdir/globus-job-manager-audit.conf"; - $self->{'goodconf'} = "$self->{testdir}/globus-job-manager-audit.conf"; - $self->{'badconf'} = "$self->{testdir}/globus-job-manager-audit-bad.conf"; - - return $self; -} - - -sub getGoodConfiguration() { - my $self = shift; - - copy($self->{conf}, $self->{goodconf}); - - return $self->{'goodconf'}; -} - -sub getBadConfiguration() { - my $self = shift; - my $in = new IO::File("<" . $self->{conf}); - my $out = new IO::File(">" . $self->{badconf}); - - while (<$in>) - { - $_ =~ s/^DATABASE:(.*)/DATABASE:bad$1/; - $out->print($_); - } - $in->close(); - $out->close(); - - return $self->{badconf}; -} - -# Get the test base directory -sub getTestDir() { - - my $self = shift; - return $self->{'testdir'}; -} - -# Get the job directory -sub getJobDir() { - - my $self = shift; - return $self->{'jobdir'}; -} - -# Get the test-record directory -sub getRecordDir() { - - my $self = shift; - return $self->{'recorddir'}; -} - -# Get the audit directory -sub getAuditDir() { - - my $self = shift; - return $self->{'auditdir'}; -} - -# Remove the audit directory and re-create it -sub cleanupAuditDir() { - - my $self = shift; - my $rc = 0; - - Util::debug("Removing and recreating $self->{'auditdir'}"); - if (-e $self->{'auditdir'}) { - if (system("rm -r $self->{'auditdir'}") != 0) { - Util::error("Cannot remove $self->{'auditdir'}"); - $rc = 1; - } - } - if (system("mkdir $self->{'auditdir'}") != 0) { - Util::error("Cannot create $self->{'auditdir'}"); - $rc = 1; - } - return $rc; -} - -# Replace placeholder in the job description files used in this test -# with values. Currently placeholders -sub replaceSubstitutionVars() { - - my $self = shift; - my @recordFiles = glob "$self->{'recorddir'}/*.in"; - my @jobFiles = glob "$self->{'jobdir'}/*.in"; - my @files = (@recordFiles, @jobFiles); - - foreach (@files) { - my $templateFileName = $_; - $_ =~ m/(.*)\.in$/; my $targetFileName = $1; - my $templateFile = new IO::File("$templateFileName", '<'); - my $targetFile = new IO::File("$targetFileName", '>'); - while(<$templateFile>) { - # Substitute placeholders with values - while (my($placeholder,$value) = each(%{$self->{'substVars'}})) { - s/$placeholder/$value/; - } - $targetFile->print($_); - } - } -} - -1; diff --git a/gram/jobmanager/auditing/test/perl_modules/GatekeeperManager.pm b/gram/jobmanager/auditing/test/perl_modules/GatekeeperManager.pm deleted file mode 100644 index f2d77a74fe..0000000000 --- a/gram/jobmanager/auditing/test/perl_modules/GatekeeperManager.pm +++ /dev/null @@ -1,43 +0,0 @@ -package GatekeeperManager; - -use Globus::Core::Paths; -use Util; -use strict; - -my $personal_gatekeeper = $Globus::Core::Paths::bindir - . "/globus-personal-gatekeeper"; - -# start a personal gatekeeper -sub startGatekeeper($) { - my $audit_data_dir = shift; - my $rc = 0; - my $contact; - my $startargs = "-start -auditdir $audit_data_dir"; - - if (exists $ENV{X509_CERT_DIR}) - { - $startargs .= " -x509-cert-dir $ENV{X509_CERT_DIR}" - } - - Util::debug("Starting personal gatekeeper: $personal_gatekeeper $startargs"); - chomp($contact = `$personal_gatekeeper $startargs`); - $contact =~ s/GRAM contact: //; - - if($contact eq '') { - Util::error("Could not start gatekeeper"); - $rc = 1; - } else { - $ENV{CONTACT_STRING} = $contact; - Util::debug("Started personal gatekeeper with contact \"$contact\""); - } - return $rc; -} - -# stop the personal gatekeeper -sub stopGatekeeper() { - my $command = "globus-personal-gatekeeper -kill \"$ENV{CONTACT_STRING}\" >/dev/null 2>&1"; - Util::debug("Stopping personal gatekeeper: $command"); - system("$command"); -} - -1; diff --git a/gram/jobmanager/auditing/test/perl_modules/Makefile.am b/gram/jobmanager/auditing/test/perl_modules/Makefile.am deleted file mode 100644 index 08130783bb..0000000000 --- a/gram/jobmanager/auditing/test/perl_modules/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -pkgtestdir = $(GLOBUS_LOCATION)/test/$(PACKAGE) -pkgdatadir = $(GLOBUS_LOCATION)/test/$(PACKAGE)/perl_modules - -pkgtest_SCRIPTS = - -pkgdata_DATA= \ - ConfigurationManager.pm \ - GatekeeperManager.pm \ - Uploader.pm \ - Util.pm - -EXTRA_DIST = \ - GatekeeperManager.pm \ - Util.pm \ - ConfigurationManager.pm.in \ - Uploader.pm.in diff --git a/gram/jobmanager/auditing/test/perl_modules/Uploader.pm.in b/gram/jobmanager/auditing/test/perl_modules/Uploader.pm.in deleted file mode 100644 index defe73d703..0000000000 --- a/gram/jobmanager/auditing/test/perl_modules/Uploader.pm.in +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2010 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package Uploader; - -@GLOBUS_PERL_INITIALIZER@ - -use Util; -use Globus::Core::Paths; -use strict; - -sub new() { - - my $proto = shift; - my $auditdir = shift; - my $self={}; - bless($self, $proto); - - # check if the audit directory had been passed as argument - if (Util::trim($auditdir) eq "") { - Util::error("No audit directory specified in constructor of Uploader"); - } else { - $self->{'auditdir'} = $auditdir; - } - return $self; -} - -sub loadGram2RecordsIntoDatabase() { - - my $self = shift; - my $conf = shift; - my $expectErrors = shift; - my $expectedNumberLeftoverRecords = shift; - my $uploader = "$Globus::Core::Paths::libexecdir/globus-gram-audit"; - my $uploaderArgs = "--conf $conf --check --delete --audit-directory " . $self->{'auditdir'}; - - $uploaderArgs .= "> /dev/null 2>/dev/null" unless ($ENV{TEST_DEBUG}); - - if (! -e $uploader) { - Util::error("Can't find " . $uploader . " to upload records"); - return (0 == 1); - } else { - # load the records into the database - my $rcx = system("$uploader $uploaderArgs"); - - if ($expectErrors == 0) { - if ($rcx != 0) { - Util::error("Error during upload, but did not expect errors"); - return (0 == 1); - } - } else { - if ($rcx == 0) { - Util::error("Expected errors, but uploader returned success"); - return (0 == 1); - } - } - } - - # verify that the number of leftover files in the audit - # directory fits with the number of expected errors - Util::debug("Checking for " . $expectedNumberLeftoverRecords . - " leftover audit record files after upload in " . $self->{'auditdir'}); - my @leftoverFiles = glob($self->{'auditdir'}."/*.gramaudit"); - my $count = @leftoverFiles; - if ($count != $expectedNumberLeftoverRecords) { - Util::error("Expected " . $expectedNumberLeftoverRecords . - " leftover files, but " . $count . " files are left over"); - return (0 == 1); - } - - return (0 == 0); -} - -1; diff --git a/gram/jobmanager/auditing/test/perl_modules/Util.pm b/gram/jobmanager/auditing/test/perl_modules/Util.pm deleted file mode 100644 index 09178ad8ce..0000000000 --- a/gram/jobmanager/auditing/test/perl_modules/Util.pm +++ /dev/null @@ -1,23 +0,0 @@ -package Util; - -use strict; - -# remove whitespaces from string -sub trim ($) { - my $string = shift; - $string =~ s/^\s+//; - $string =~ s/\s+$//; - return $string; -} - -sub debug($) { - my $string = shift; - print STDOUT " [DEBUG]: $string\n" if ($ENV{TEST_DEBUG}); -} - -sub error($) { - my $string = shift; - print STDOUT " [-->ERROR<--]: $string\n"; -} - -1; diff --git a/gram/jobmanager/auditing/test/records/Makefile.am b/gram/jobmanager/auditing/test/records/Makefile.am deleted file mode 100644 index 0fcc9acfb6..0000000000 --- a/gram/jobmanager/auditing/test/records/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -pkgtestdir = $(GLOBUS_LOCATION)/test/$(PACKAGE) -pkgdatadir = $(GLOBUS_LOCATION)/test/$(PACKAGE)/records - -pkgtest_SCRIPTS = - -pkgdata_DATA = \ - invalid-queued-timestamp.gramaudit.in \ - non-existing-username.gramaudit.in \ - too-few-fields.gramaudit.in \ - ok.gramaudit.in - -EXTRA_DIST = $(pkgdata_DATA) diff --git a/gram/jobmanager/auditing/test/records/invalid-queued-timestamp.gramaudit.in b/gram/jobmanager/auditing/test/records/invalid-queued-timestamp.gramaudit.in deleted file mode 100644 index f7b605e318..0000000000 --- a/gram/jobmanager/auditing/test/records/invalid-queued-timestamp.gramaudit.in +++ /dev/null @@ -1 +0,0 @@ -"https://localhost:49851/13608/1218822812/","13612","/DC=org/DC=doegrids/OU=People/CN=Martin Feller 807394","__CURRENT_USER__","NULL","Fri Aug 15 17:53:32 UTC 2008","Fri Aug 15 17:53:33 2008","NULL","NULL","NULL","4.2.0","fork","&("rsl_substitution" = ("GLOBUSRUN_GASS_URL" "https://localhost:49847" ) )("stderr" = $("GLOBUSRUN_GASS_URL") # "/dev/stderr" )("stdout" = $("GLOBUSRUN_GASS_URL") # "/dev/stdout" )("executable" = "/usr/bin/true" )","true","true" diff --git a/gram/jobmanager/auditing/test/records/non-existing-username.gramaudit.in b/gram/jobmanager/auditing/test/records/non-existing-username.gramaudit.in deleted file mode 100644 index e8bc209d6c..0000000000 --- a/gram/jobmanager/auditing/test/records/non-existing-username.gramaudit.in +++ /dev/null @@ -1 +0,0 @@ -"https://localhost:49516/15835/1219088898/","15843","/DC=org/DC=doegrids/OU=People/CN=Martin Feller 807394","ihopefullydontexist","NULL","Mon Aug 18 19:48:18 UTC 2008","Mon Aug 18 19:48:19 UTC 2008","NULL","NULL","NULL","4.2.0","fork","&("rsl_substitution" = ("GLOBUSRUN_GASS_URL" "https://localhost:49512" ) )("stderr" = $("GLOBUSRUN_GASS_URL") # "/dev/stderr" )("stdout" = $("GLOBUSRUN_GASS_URL") # "/dev/stdout" )("executable" = "/bin/echo" )("arguments" = "back-ticks like ` are useful" )","false","true" diff --git a/gram/jobmanager/auditing/test/records/ok.gramaudit.in b/gram/jobmanager/auditing/test/records/ok.gramaudit.in deleted file mode 100644 index e338d2142b..0000000000 --- a/gram/jobmanager/auditing/test/records/ok.gramaudit.in +++ /dev/null @@ -1 +0,0 @@ -"https://localhost:49516/15835/1219088898/","15843","/DC=org/DC=doegrids/OU=People/CN=Martin Feller 807394","__CURRENT_USER__","NULL","Mon Aug 18 19:48:18 UTC 2008","Mon Aug 18 19:48:19 UTC 2008","NULL","NULL","NULL","4.2.0","fork","&("rsl_substitution" = ("GLOBUSRUN_GASS_URL" "https://localhost:49512" ) )("stderr" = $("GLOBUSRUN_GASS_URL") # "/dev/stderr" )("stdout" = $("GLOBUSRUN_GASS_URL") # "/dev/stdout" )("executable" = "/bin/echo" )("arguments" = "back-ticks like ` are useful" )","false","true" diff --git a/gram/jobmanager/auditing/test/records/too-few-fields.gramaudit.in b/gram/jobmanager/auditing/test/records/too-few-fields.gramaudit.in deleted file mode 100644 index 8741390f88..0000000000 --- a/gram/jobmanager/auditing/test/records/too-few-fields.gramaudit.in +++ /dev/null @@ -1 +0,0 @@ -"https://localhost:49851/13608/1218822812/","13612","/DC=org/DC=doegrids/OU=People/CN=Martin Feller 807394","__CURRENT_USER__","NULL","Fri Aug 15 17:53:32 UTC 2008","Fri Aug 15 17:53:33 UTC 2008","NULL","NULL","NULL","4.2.0","fork","&("rsl_substitution" = ("GLOBUSRUN_GASS_URL" "https://localhost:49847" ) )("stderr" = $("GLOBUSRUN_GASS_URL") # "/dev/stderr" )("stdout" = $("GLOBUSRUN_GASS_URL") # "/dev/stdout" )("executable" = "/usr/bin/true" )","true" diff --git a/gram/jobmanager/auditing/test/shibproxy.pem b/gram/jobmanager/auditing/test/shibproxy.pem deleted file mode 100644 index 16eadceabd..0000000000 --- a/gram/jobmanager/auditing/test/shibproxy.pem +++ /dev/null @@ -1,67 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIH2jCCB0OgAwIBAgIDC09TMA0GCSqGSIb3DQEBBAUAMFUxCzAJBgNVBAYTAlVT -MRgwFgYDVQQKEw9HbG9idXMgQWxsaWFuY2UxDTALBgNVBAsTBFVzZXIxHTAbBgNV -BAMTFDEyMTdkMzhhYmZmLjI2MTg4YTIwMB4XDTA5MDUyNjE4NDUwM1oXDTE5MDUy -NDE4NTAwM1owaDELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD0dsb2J1cyBBbGxpYW5j -ZTENMAsGA1UECxMEVXNlcjEdMBsGA1UEAxMUMTIxN2QzOGFiZmYuMjYxODhhMjAx -ETAPBgNVBAMTCDI0NjY3MDQ2MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKIUqJAm -ubWBUiZk6LMNdVqWV/lzM2wHzqFgW0fQbeNQraXdGRaUXjtieKG3RnKrpp70cLX5 -B8hGRLJ/t1Fo8eMCAwEAAaOCBecwggXjMB0GCCsGAQUFBwEOAQH/BA4wDDAKBggr -BgEFBQcVATCCBcAGCysGAQQBm1ABAQEMBIIFrwyCBas8QXNzZXJ0aW9uIHhtbG5z -PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoxLjA6YXNzZXJ0aW9uIiB4bWxuczpz -YW1sPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoxLjA6YXNzZXJ0aW9uIiB4bWxu -czpzYW1scD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6MS4wOnByb3RvY29sIiB4 -bWxuczp4c2Q9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxu -czp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNl -IiBBc3NlcnRpb25JRD0iX2ExOWUwN2NlNzgxMTRjNWFhOTcwZGMxYTllODliODg1 -IiBJc3N1ZUluc3RhbnQ9IjIwMDktMDUtMjZUMTg6NTA6MDIuOTk0WiIgSXNzdWVy -PSJodHRwczovL2dyaWRzaGliLmV4YW1wbGUub3JnL2lkcCIgTWFqb3JWZXJzaW9u -PSIxIiBNaW5vclZlcnNpb249IjEiPjxBdXRoZW50aWNhdGlvblN0YXRlbWVudCBB -dXRoZW50aWNhdGlvbkluc3RhbnQ9IjIwMDktMDUtMjZUMTg6MTM6MDAuMDAwWiIg -QXV0aGVudGljYXRpb25NZXRob2Q9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjEu -MDphbTpwYXNzd29yZCI+PFN1YmplY3Q+PE5hbWVJZGVudGlmaWVyIEZvcm1hdD0i -aHR0cDovL3RlcmFncmlkLm9yZy9uYW1lcy9uYW1laWQtZm9ybWF0L3ByaW5jaXBh -bG5hbWUiPnRlc3R1c2VyQGV4YW1wbGUub3JnPC9OYW1lSWRlbnRpZmllcj48U3Vi -amVjdENvbmZpcm1hdGlvbj48Q29uZmlybWF0aW9uTWV0aG9kPnVybjpvYXNpczpu -YW1lczp0YzpTQU1MOjEuMDpjbTpzZW5kZXItdm91Y2hlczwvQ29uZmlybWF0aW9u -TWV0aG9kPjwvU3ViamVjdENvbmZpcm1hdGlvbj48L1N1YmplY3Q+PFN1YmplY3RM -b2NhbGl0eSBJUEFkZHJlc3M9IjI1NS4yNTUuMjU1LjI1NSI+PC9TdWJqZWN0TG9j -YWxpdHk+PC9BdXRoZW50aWNhdGlvblN0YXRlbWVudD48QXR0cmlidXRlU3RhdGVt -ZW50PjxTdWJqZWN0PjxOYW1lSWRlbnRpZmllciBGb3JtYXQ9Imh0dHA6Ly90ZXJh -Z3JpZC5vcmcvbmFtZXMvbmFtZWlkLWZvcm1hdC9wcmluY2lwYWxuYW1lIj50ZXN0 -dXNlckBleGFtcGxlLm9yZzwvTmFtZUlkZW50aWZpZXI+PFN1YmplY3RDb25maXJt -YXRpb24+PENvbmZpcm1hdGlvbk1ldGhvZD51cm46b2FzaXM6bmFtZXM6dGM6U0FN -TDoxLjA6Y206c2VuZGVyLXZvdWNoZXM8L0NvbmZpcm1hdGlvbk1ldGhvZD48L1N1 -YmplY3RDb25maXJtYXRpb24+PC9TdWJqZWN0PjxBdHRyaWJ1dGUgQXR0cmlidXRl -TmFtZT0idXJuOm9pZDoxLjMuNi4xLjQuMS41OTIzLjEuNS4xLjEiIEF0dHJpYnV0 -ZU5hbWVzcGFjZT0idXJuOm1hY2U6c2hpYmJvbGV0aDoxLjA6YXR0cmlidXRlTmFt -ZXNwYWNlOnVyaSI+PEF0dHJpYnV0ZVZhbHVlIHhzaTp0eXBlPSJ4c2Q6c3RyaW5n -Ij5ncm91cDovL2V4YW1wbGUub3JnL2V4YW1wbGU8L0F0dHJpYnV0ZVZhbHVlPjwv -QXR0cmlidXRlPjwvQXR0cmlidXRlU3RhdGVtZW50PjwvQXNzZXJ0aW9uPjANBgkq -hkiG9w0BAQQFAAOBgQBUggMhGhha3OMvWG60cDYEnooS3Ii0pQDDj3PbdbplcvcB -p1N+pwP5FP6FuzGDz2ecNyn2oQ5xpuEca9O856o5aBZXhYZAyBTaNl/Njn+duwTK -666g5gzMyvjEQjCvRtCZtOjH9X00JIl4CbzGM+lJ7W9w1WheAIfxZafVeCpK9w== ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIIBPAIBAAJBAKIUqJAmubWBUiZk6LMNdVqWV/lzM2wHzqFgW0fQbeNQraXdGRaU -XjtieKG3RnKrpp70cLX5B8hGRLJ/t1Fo8eMCAwEAAQJBAIdpHP7565NRjLGZArR8 -3Pumua8laOOrjh1S5FAWOYh8DYUggSCeVSnH1EEgIL1nlsVwYwbYvpG52u+CkVcZ -FEkCIQDN8r2Yvk2+nByZ/kcREyW8QMGHMt/q8TwfcnxRQS2b3QIhAMl4qPJ0nx0m -jhyAMTmRvKWGb5RvUSNDEhwKzaFxwci/AiAPokCwSqn+MT2elwXwDuMLcmL+j2ce -H6fvvzIevPLoZQIhAK3b9Rd9sk1qlxpbOZ9vd3b0A1f5k/A1EeynGfpm+45rAiEA -x9NKfMwo38s94xqcTlvQpj/uccAIb9+CAlbtziMEGNw= ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIICLTCCAZagAwIBAgICFX8wDQYJKoZIhvcNAQEEBQAwTDELMAkGA1UEBhMCVVMx -GDAWBgNVBAoTD0dsb2J1cyBBbGxpYW5jZTEjMCEGA1UEAxMaR2xvYnVzIENlcnRp -ZmljYXRlIFNlcnZpY2UwHhcNMDkwNTI2MTM1NTE0WhcNMTkwNTI0MTQwMDE0WjBV -MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR2xvYnVzIEFsbGlhbmNlMQ0wCwYDVQQL -EwRVc2VyMR0wGwYDVQQDExQxMjE3ZDM4YWJmZi4yNjE4OGEyMDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAuMizDy6nzDNXnswpI4M41rkxYPFElh+AUmHbBKxt -VUCV62/s7TnWrTy+/NQxpysOcZkr9vup/W6HTu0gCtNO6ArZbCO1/rmNPG9k28B3 -67jsjWrHsnD6aGGSowZad3R6mMQxxl4mnqNMRw+HVm+Ekj9LmxPcdJZUljCK0uIV -YDECAwEAAaMVMBMwEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBAUAA4GB -AK3HBiFaR3b0z9z5Vkc9h8tN6OY2TQ5t5zzIRf+sEZIFzUiF32PVeIfHa1pXi24t -kW2VGUBlps7S5fEMPz9hUpK2DMX/pw4jFrJB7D6P5GgG3oSEFRnzgQ0LlsWqGDzk -QDjPSiJ7VSsoIv7WtDNw0Ebabjfxboex5uL9DhdvtBOJ ------END CERTIFICATE----- diff --git a/gram/jobmanager/auditing/test/testcert.pem b/gram/jobmanager/auditing/test/testcert.pem deleted file mode 100644 index 08093affdb..0000000000 --- a/gram/jobmanager/auditing/test/testcert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLTCCAZagAwIBAgICFX8wDQYJKoZIhvcNAQEEBQAwTDELMAkGA1UEBhMCVVMx -GDAWBgNVBAoTD0dsb2J1cyBBbGxpYW5jZTEjMCEGA1UEAxMaR2xvYnVzIENlcnRp -ZmljYXRlIFNlcnZpY2UwHhcNMDkwNTI2MTM1NTE0WhcNMTkwNTI0MTQwMDE0WjBV -MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR2xvYnVzIEFsbGlhbmNlMQ0wCwYDVQQL -EwRVc2VyMR0wGwYDVQQDExQxMjE3ZDM4YWJmZi4yNjE4OGEyMDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAuMizDy6nzDNXnswpI4M41rkxYPFElh+AUmHbBKxt -VUCV62/s7TnWrTy+/NQxpysOcZkr9vup/W6HTu0gCtNO6ArZbCO1/rmNPG9k28B3 -67jsjWrHsnD6aGGSowZad3R6mMQxxl4mnqNMRw+HVm+Ekj9LmxPcdJZUljCK0uIV -YDECAwEAAaMVMBMwEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBAUAA4GB -AK3HBiFaR3b0z9z5Vkc9h8tN6OY2TQ5t5zzIRf+sEZIFzUiF32PVeIfHa1pXi24t -kW2VGUBlps7S5fEMPz9hUpK2DMX/pw4jFrJB7D6P5GgG3oSEFRnzgQ0LlsWqGDzk -QDjPSiJ7VSsoIv7WtDNw0Ebabjfxboex5uL9DhdvtBOJ ------END CERTIFICATE----- diff --git a/gram/jobmanager/auditing/test/testkey.pem b/gram/jobmanager/auditing/test/testkey.pem deleted file mode 100644 index d24a1eb43c..0000000000 --- a/gram/jobmanager/auditing/test/testkey.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQC4yLMPLqfMM1eezCkjgzjWuTFg8USWH4BSYdsErG1VQJXrb+zt -OdatPL781DGnKw5xmSv2+6n9bodO7SAK007oCtlsI7X+uY08b2TbwHfruOyNasey -cPpoYZKjBlp3dHqYxDHGXiaeo0xHD4dWb4SSP0ubE9x0llSWMIrS4hVgMQIDAQAB -AoGAeW/8rVeeEwcS6FuIFbyhWAwxNWKaDob5UCrbQ0EGQWbGoAnYjTbbrNIlOgdB -8njLb0CYsiJGXzWKWwZfbn3cdmehrQ1gQNsInC4rtk24VYh2KjDL/D0M3wtWqWD+ -DZ5cjnyziOBhjLGtF73DkOIYtq5JfxHUNXXhP8SPKTqvzCECQQDvqwHAEQokT8hV -r01ru9qytpPBbxFoCJ1PzndHAajq3bZv7rbC1iNFV+f+MnXSDA4D3yz+Rg2z6dT0 -seeYkFadAkEAxWA+k7vioABkNsNg41Kp0rQcZz/94g2xZBDpwuSN17amw8GAEGq2 -JN8Ykame1L0dinacEdXWpr+xqYFSCGexpQJBAK1uwUB81Cr8tQsUZWEdup/ysS+c -MStoeHYlAXmXwOXc9UVAqG6LyVBH0bDIUSxj3sx8drG2ffoAr0M3blGfuZ0CQBTz -w5DROBx+DiVWFjnrc4Wfgwhe3aeahoM13GrI8lm81PUg3GRhv5YobKZB2E+DB9jE -AItQJOosnUJ+LOQhhdUCQGx8KO5E8D3ZCzjo9sucE9zcrnMFYbp6ghYEqskmKha3 -hRlN9iB7tVnucvUmZZy6ARvbA4lZWDNvYsEZm3avODs= ------END RSA PRIVATE KEY----- diff --git a/gram/jobmanager/auditing/test/testproxy.pem b/gram/jobmanager/auditing/test/testproxy.pem deleted file mode 100644 index c827a1550b..0000000000 --- a/gram/jobmanager/auditing/test/testproxy.pem +++ /dev/null @@ -1,37 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICFzCCAYCgAwIBAgIEffkYcTANBgkqhkiG9w0BAQQFADBVMQswCQYDVQQGEwJV -UzEYMBYGA1UEChMPR2xvYnVzIEFsbGlhbmNlMQ0wCwYDVQQLEwRVc2VyMR0wGwYD -VQQDExQxMjE3ZDM4YWJmZi4yNjE4OGEyMDAeFw0wOTA1MjYxNzQ5MjFaFw0xOTA1 -MjQxNDAwMTRaMGoxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HbG9idXMgQWxsaWFu -Y2UxDTALBgNVBAsTBFVzZXIxHTAbBgNVBAMTFDEyMTdkMzhhYmZmLjI2MTg4YTIw -MRMwEQYDVQQDEwoyMTEzNDc2NzIxMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMH9 -3tgO7gFsunZe/hkd7EGJV/AzzeF+lDcgDpJx8CxrEi4WdzSc/FPB+6XELlGIDZec -OjZ8OcxB2AEVwmkEuF0CAwEAAaMjMCEwHwYKKwYBBAGbUAGBXgEB/wQOMAwwCgYI -KwYBBQUHFQEwDQYJKoZIhvcNAQEEBQADgYEARw2of1QqNThyG6IDetkdQweS/R87 -sKeQ8wcU5UBsf+We+7Au0z+EM40kBcRgn74WdVnKJbpFNTnLVf8JH7AkFme9/Wbm -12zjW8cxMMr5b7WbxHxfcjEuuDRs7bzcTlW6QT9IUa5rbrYbzABAuZbM3FYvZOFA -0e96NXYiMWxh4CQ= ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBAMH93tgO7gFsunZe/hkd7EGJV/AzzeF+lDcgDpJx8CxrEi4WdzSc -/FPB+6XELlGIDZecOjZ8OcxB2AEVwmkEuF0CAwEAAQJAb0kP+ao25yJUpWtBIW+F -BOOhSu6tANr4c9c0BNbQDOovvmTPn+Io4yvxGFdJ5oO5FT4TDyHp0rqBkh39g1k/ -AQIhAOLVD1JDLjqqTKCpIoMVw8CXA3GEe6q8wYMe7aQa3wZtAiEA2u/A2/h5kHaF -CsWqLcSRIBUAxcXS9SrfRwr17Ff2A7ECIHlA/Xyy7s5rZKTpZMp/4vFbiHqxIE5n -smX+LXhw6NGNAiEApJgWj8kv6zGPN9f+5sWerVXc7NKalIKUtZ5B4FsIsyECIG+/ -ROYtG/bCYh393fBbB5V0kg7dYBAyjbQrLTMLHgBA ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIICLTCCAZagAwIBAgICFX8wDQYJKoZIhvcNAQEEBQAwTDELMAkGA1UEBhMCVVMx -GDAWBgNVBAoTD0dsb2J1cyBBbGxpYW5jZTEjMCEGA1UEAxMaR2xvYnVzIENlcnRp -ZmljYXRlIFNlcnZpY2UwHhcNMDkwNTI2MTM1NTE0WhcNMTkwNTI0MTQwMDE0WjBV -MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR2xvYnVzIEFsbGlhbmNlMQ0wCwYDVQQL -EwRVc2VyMR0wGwYDVQQDExQxMjE3ZDM4YWJmZi4yNjE4OGEyMDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAuMizDy6nzDNXnswpI4M41rkxYPFElh+AUmHbBKxt -VUCV62/s7TnWrTy+/NQxpysOcZkr9vup/W6HTu0gCtNO6ArZbCO1/rmNPG9k28B3 -67jsjWrHsnD6aGGSowZad3R6mMQxxl4mnqNMRw+HVm+Ekj9LmxPcdJZUljCK0uIV -YDECAwEAAaMVMBMwEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBAUAA4GB -AK3HBiFaR3b0z9z5Vkc9h8tN6OY2TQ5t5zzIRf+sEZIFzUiF32PVeIfHa1pXi24t -kW2VGUBlps7S5fEMPz9hUpK2DMX/pw4jFrJB7D6P5GgG3oSEFRnzgQ0LlsWqGDzk -QDjPSiJ7VSsoIv7WtDNw0Ebabjfxboex5uL9DhdvtBOJ ------END CERTIFICATE----- diff --git a/gram/jobmanager/lrms/fork/test/.gitignore b/gram/jobmanager/lrms/fork/test/.gitignore deleted file mode 100644 index 80c6742efc..0000000000 --- a/gram/jobmanager/lrms/fork/test/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -*.lo -*.la -.libs diff --git a/gram/jobmanager/lrms/fork/test/Makefile.am b/gram/jobmanager/lrms/fork/test/Makefile.am deleted file mode 100644 index 0c40273d7d..0000000000 --- a/gram/jobmanager/lrms/fork/test/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -SUBDIRS = seg - -test_SCRIPTS = TESTS.pl TESTS-junit.pl - - -test: all - perl "-I@perlmoduledir@" TESTS.pl - -junit: all - perl "-I@perlmoduledir@" TESTS-junit.pl - -EXTRA_DIST = dirt.sh TESTS.pl.in TESTS-junit.pl.in - -.PHONY: junit test diff --git a/gram/jobmanager/lrms/fork/test/TESTS-junit.pl.in b/gram/jobmanager/lrms/fork/test/TESTS-junit.pl.in deleted file mode 100644 index 50429e4a01..0000000000 --- a/gram/jobmanager/lrms/fork/test/TESTS-junit.pl.in +++ /dev/null @@ -1,65 +0,0 @@ -#! /usr/bin/perl - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -require 5.005; -use vars qw(@tests); - -my $harness; -BEGIN { - my $xmlfile = 'globus_gram_job_manager_fork_test.xml'; - - eval "use TAP::Harness::JUnit"; - if ($@) - { - eval "use TAP::Harness;"; - - if ($@) - { - die "Unable to find JUnit TAP formatter"; - } - else - { - $harness = TAP::Harness->new( { - formatter_class => 'TAP::Formatter::JUnit', - merge => 1 - } ); - } - open(STDOUT, ">$xmlfile"); - } - else - { - $harness = TAP::Harness::JUnit->new({ - xmlfile => $xmlfile, - merge => 1}); - } - #$Test::Harness::verbose = 1; - -} - -my $testdir = $0; -if ($testdir =~ m|/|) -{ - $testdir =~ s|/+[^/]*$||; -} -else -{ - $testdir = '.'; -} - -my $test_result = 1; -$|=1; - -@tests = (); - -if (-d "$testdir/seg") -{ - push(@tests, "$testdir/seg/test-fork-seg.pl"); -} -else -{ - push(@tests, "$testdir/test-fork-seg.pl"); -} - -$harness->runtests(@tests); diff --git a/gram/jobmanager/lrms/fork/test/TESTS.pl.in b/gram/jobmanager/lrms/fork/test/TESTS.pl.in deleted file mode 100644 index 2b804a5fd9..0000000000 --- a/gram/jobmanager/lrms/fork/test/TESTS.pl.in +++ /dev/null @@ -1,43 +0,0 @@ -#! /usr/bin/perl - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -use Test::Harness; - -require 5.005; -use vars qw(@tests); - -my $testdir = $0; -if ($testdir =~ m|/|) -{ - $testdir =~ s|/+[^/]*$||; -} -else -{ - $testdir = '.'; -} - -my $test_result = 1; -$|=1; - -@tests = (); -if (-d "$testdir/seg") -{ - push(@tests, "$testdir/seg/test-fork-seg.pl"); -} -else -{ - push(@tests, "$testdir/test-fork-seg.pl"); -} - -$test_result = eval { runtests(@tests) }; -if(!defined($test_result)) -{ - print $@; - $test_result=1; -} -else -{ - $test_result=0; -} diff --git a/gram/jobmanager/lrms/fork/test/configure.in b/gram/jobmanager/lrms/fork/test/configure.in deleted file mode 100644 index b6c7dddab1..0000000000 --- a/gram/jobmanager/lrms/fork/test/configure.in +++ /dev/null @@ -1,19 +0,0 @@ -AC_REVISION($Revision$) -AC_INIT(Makefile.am) - -GLOBUS_INIT - -AM_PROG_LIBTOOL - -dnl Initialize the automake rules the last argument -AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION) - - -GLOBUS_FINALIZE - -AC_OUTPUT( - Makefile - seg/Makefile - TESTS.pl - TESTS-junit.pl -) diff --git a/gram/jobmanager/lrms/fork/test/dirt.sh.in b/gram/jobmanager/lrms/fork/test/dirt.sh.in deleted file mode 100644 index f9787f7d31..0000000000 --- a/gram/jobmanager/lrms/fork/test/dirt.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -DIRT_TIMESTAMP=@DIRT_TIMESTAMP@ -DIRT_BRANCH_ID=@DIRT_BRANCH_ID@ diff --git a/gram/jobmanager/lrms/fork/test/seg/.gitignore b/gram/jobmanager/lrms/fork/test/seg/.gitignore deleted file mode 100644 index 80c6742efc..0000000000 --- a/gram/jobmanager/lrms/fork/test/seg/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -*.lo -*.la -.libs diff --git a/gram/jobmanager/lrms/fork/test/seg/Makefile.am b/gram/jobmanager/lrms/fork/test/seg/Makefile.am deleted file mode 100644 index a54d1f4e85..0000000000 --- a/gram/jobmanager/lrms/fork/test/seg/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -testdir = @testdir@ - -test_SCRIPTS = test-fork-seg.pl -test_DATA = test-fork-seg-data.txt - -EXTRA_DIST = $(test_SCRIPTS) $(test_DATA) diff --git a/gram/jobmanager/lrms/fork/test/seg/test-fork-seg-data.txt b/gram/jobmanager/lrms/fork/test/seg/test-fork-seg-data.txt deleted file mode 100644 index 80b8a517c3..0000000000 --- a/gram/jobmanager/lrms/fork/test/seg/test-fork-seg-data.txt +++ /dev/null @@ -1,136 +0,0 @@ -00000;0;pending -00003;0;active -00005;0;failed -00007;1;active -00008;1;failed -00010;2;active -00013;3;pending -00013;2;done -00016;3;active -00020;4;pending -00020;3;failed -00024;4;done -00027;5;pending -00029;5;active -00032;5;done -00036;6;pending -00037;6;active -00041;6;done -00044;7;active -00046;8;pending -00046;7;done -00050;8;active -00052;8;failed -00054;9;pending -00057;9;active -00058;9;done -00061;10;pending -00065;10;active -00067;10;failed -00070;11;pending -00072;11;active -00074;11;done -00077;12;pending -00081;12;active -00082;12;done -00086;13;pending -00090;13;active -00092;13;done -00092;14;pending -00094;14;active -00096;14;done -00098;15;pending -00101;15;active -00105;15;failed -00107;16;pending -00110;16;active -00111;16;done -00112;17;pending -00113;17;active -00114;17;failed -00117;18;active -00120;18;done -00120;19;pending -00123;19;active -00126;19;failed -00129;20;pending -00132;20;active -00135;20;failed -00137;21;pending -00140;21;active -00142;21;done -00145;22;pending -00146;22;done -00149;23;active -00150;23;done -00152;24;pending -00155;24;active -00157;24;failed -00158;25;active -00162;25;failed -00162;26;pending -00165;26;active -00168;26;failed -00170;27;pending -00172;27;active -00176;27;done -00180;28;pending -00182;28;failed -00184;29;pending -00185;29;active -00186;29;failed -00187;30;pending -00190;30;active -00193;30;done -00195;31;pending -00196;31;active -00198;31;failed -00201;32;pending -00205;32;active -00207;32;done -00210;33;pending -00214;33;active -00217;33;failed -00217;34;pending -00218;34;active -00221;35;pending -00221;34;failed -00224;35;active -00226;35;done -00228;36;pending -00232;36;active -00233;36;done -00233;37;pending -00235;37;active -00237;37;failed -00241;38;pending -00242;38;active -00245;38;done -00247;39;pending -00251;39;active -00252;39;done -00255;40;pending -00257;40;active -00261;40;failed -00263;41;pending -00265;41;done -00266;42;active -00270;42;failed -00271;43;pending -00272;43;active -00274;43;failed -00274;44;done -00278;45;pending -00280;45;active -00281;45;done -00282;46;pending -00284;46;active -00286;46;failed -00288;47;pending -00291;48;pending -00291;47;done -00292;48;active -00293;49;pending -00293;48;failed -00294;49;active -00295;49;failed diff --git a/gram/jobmanager/lrms/fork/test/seg/test-fork-seg.pl b/gram/jobmanager/lrms/fork/test/seg/test-fork-seg.pl deleted file mode 100755 index 133eb110fa..0000000000 --- a/gram/jobmanager/lrms/fork/test/seg/test-fork-seg.pl +++ /dev/null @@ -1,145 +0,0 @@ -#! /usr/bin/perl - -use Globus::Core::Paths; -use Globus::Core::Config; -use IO::File; -use File::Path; -use File::Compare; -use File::Temp qw(tempdir); -use Test::More; -my $testdir = $0; -if ($testdir =~ m|/|) -{ - $testdir =~ s|/+[^/]*$||; -} -else -{ - $testdir = '.'; -} - -my $start = time(); -my $testtmp = tempdir( CLEANUP => 1 ); -my @log_data; -my $skip_all = 0; -my $gram_fork_conf = Globus::Core::Paths::eval_path('${sysconfdir}/globus/globus-fork.conf'); -my $gram_fork_conf_save = "${gram_fork_conf}.save"; -my $config = new Globus::Core::Config($gram_fork_conf); -my $log_path = $config->get_attribute("log_path"); - -if (! defined($log_path)) -{ - plan skip_all => "Fork SEG not configured"; -} -else -{ - plan tests => 1; - ok(run_test() eq '0', "SEG test"); -} - - -sub run_test -{ - if (! $skip_all) - { - @test_data = &parse_test_data(); - &write_test_data_to_log($log_path, @test_data); - my $rc = &run_fork_seg("$testtmp/output"); - - if ($rc == 0) - { - return compare("$testtmp/output", $log_path); - } - else - { - return 'Unable to run SEG with fork module: is it installed?'; - } - } - else - { - return "skip"; - } -} - -sub run_fork_seg -{ - my $output = shift; - my $seg = "$Globus::Core::Paths::sbindir/globus-scheduler-event-generator"; - my @args = ($seg, '-s', 'fork', '-t', $start); - my $pid2 = open(FH, "|-"); - my $size; - - if ($pid2 == 0) - { - open(STDOUT, ">$output"); - open(STDERR, '>/dev/null'); - exec {$args[0]} @args; - } - - while (! -f $output) - { - sleep(1); - } - - do - { - $size = -s $output; - sleep(5); - } while ($size < (-s $output)); - - close(FH); - - return $?; -} - -sub parse_test_data -{ - my @result; - local *IN; - - open(IN, "<$testdir/test-fork-seg-data.txt"); - - while () { - my $state; - chomp; - - ($sleep, $jobid, $type) = split(/;/, $_); - - push (@result, [$sleep, $jobid, $type]); - } - return @result; -} - -sub write_test_data_to_log { - my $path = shift; - truncate($path, 0); - - my $last_sleep = 0; - foreach (@test_data) { - my $state; - - ($sleep, $jobid, $type) = ($_->[0], $_->[1], $_->[2]); - - #sleep($sleep - $last_sleep); - $last_sleep = $sleep; - if ($type =~ m/pending/) { - $state = 1; - } elsif ($type =~ m/active/) { - $state = 2; - } elsif ($type =~ m/done/) { - $state = 8; - } elsif ($type =~ m/failed/) { - $state = 4; - } - open(LOG, ">>$path"); - printf LOG "001;%d;$jobid;$state;0\n", $start + $sleep; - close(LOG) - } -} - -END -{ - if (-f $gram_fork_conf_save) - { - rename($gram_fork_conf_save, $gram_fork_conf); - } -} diff --git a/gridftp/server/test/Makefile.am b/gridftp/server/test/Makefile.am deleted file mode 100644 index ca0ac12fa8..0000000000 --- a/gridftp/server/test/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -globusperldir = $(libdir)/perl/Globus - -test_SCRIPTS = \ - gfs_common.pl \ - globus-gridftp-gfork-mem.pl \ - globus-gridftp-dyn-be.pl \ - globus-gridftp-gfork-fe.pl \ - globus-gridftp-be-gfork.pl - -test_DATA = \ - dc31a685.signing_policy \ - dc31a685.0 \ - testcred.pem \ - gfork_mem_conf.in \ - gfork_conf.in \ - gfork_single_conf.in \ - gfork_be_conf.in - -EXTRA_DIST = \ - $(test_DATA) \ - dirt.sh \ - gfs_common.pl.in \ - globus-gridftp-gfork-mem.pl.in \ - globus-gridftp-dyn-be.pl.in \ - globus-gridftp-gfork-fe.pl.in \ - globus-gridftp-be-gfork.pl.in diff --git a/gridftp/server/test/configure.in b/gridftp/server/test/configure.in deleted file mode 100644 index 80dd160653..0000000000 --- a/gridftp/server/test/configure.in +++ /dev/null @@ -1,24 +0,0 @@ -dnl - -AC_REVISION($Revision$) -AC_INIT(Makefile.am) - -GLOBUS_INIT - -AM_PROG_LIBTOOL - -dnl config header goes here - -dnl Initialize the automake rules the last argument -AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION) - -GLOBUS_FINALIZE - -AC_OUTPUT( - Makefile - gfs_common.pl - globus-gridftp-be-gfork.pl - globus-gridftp-dyn-be.pl - globus-gridftp-gfork-fe.pl - globus-gridftp-gfork-mem.pl -) diff --git a/gridftp/server/test/dc31a685.0 b/gridftp/server/test/dc31a685.0 deleted file mode 100644 index 86ccefd0be..0000000000 --- a/gridftp/server/test/dc31a685.0 +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfTCCAeagAwIBAgIBADANBgkqhkiG9w0BAQQFADBhMQ0wCwYDVQQKEwRHcmlk -MRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVDQS1nbG9idXMu -b3JnMR0wGwYDVQQDExRHbG9idXMgVGVzdCBTdWl0ZSBDQTAeFw0wMzA2MDYwMTAw -MTlaFw0xMzA2MDMwMTAwMTlaMGExDTALBgNVBAoTBEdyaWQxEzARBgNVBAsTCkds -b2J1c1Rlc3QxHDAaBgNVBAsTE3NpbXBsZUNBLWdsb2J1cy5vcmcxHTAbBgNVBAMT -FEdsb2J1cyBUZXN0IFN1aXRlIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB -gQC6/PrZ0hpXU5kGv+g9poGTfiIJT5RPB2w0FTUej0O62CDuK8UMm/3I0VtCLrjq -gTm8LyqqR0O1fMJqbGczo59ROdSEetYRkqkOWyZkLRfG34ahO6p2H4MPwfoZxfuO -I/y7bg9TLAEQqMMI+/wWewwXKffOIHVs39EvywG9AM4flwIDAQABo0UwQzAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQkM1gkOnip6wrknN0pwuzT/7okuzARBglg -hkgBhvhCAQEEBAMCAAcwDQYJKoZIhvcNAQEEBQADgYEAY7HTu0sVdwWH4fLcf7x+ -XoqzVxCXZ97rt9TZXBEQ3A9DnmtOrg/dlHPbUZqyuy5M+d3a+d/Mk7PCdlok8nA6 -CJ25Q0HmL3WMQ/saTx49h04QnX1mpa1z2Q/qp8/wWVkUd9hXyXEXVqmWA53bRcP4 -ueAa7Dnn5BAzDyb7KZXqK/8= ------END CERTIFICATE----- diff --git a/gridftp/server/test/dc31a685.signing_policy b/gridftp/server/test/dc31a685.signing_policy deleted file mode 100644 index d940479d28..0000000000 --- a/gridftp/server/test/dc31a685.signing_policy +++ /dev/null @@ -1,33 +0,0 @@ -# ca-signing-policy.conf, see ca-signing-policy.doc for more information -# -# This is the configuration file describing the policy for what CAs are -# allowed to sign whoses certificates. -# -# This file is parsed from start to finish with a given CA and subject -# name. -# subject names may include the following wildcard characters: -# * Matches any number of characters. -# ? Matches any single character. -# -# CA names must be specified (no wildcards). Names containing whitespaces -# must be included in single quotes, e.g. 'Certification Authority'. -# Names must not contain new line symbols. -# The value of condition attribute is represented as a set of regular -# expressions. Each regular expression must be included in double quotes. -# -# This policy file dictates the following policy: -# -The Globus CA can sign Globus certificates -# -# Format: -#------------------------------------------------------------------------ -# token type | def.authority | value -#--------------|---------------|----------------------------------------- -# EACL entry #1| - - access_id_CA X509 '/O=Grid/OU=GlobusTest/OU=simpleCA-globus.org/CN=Globus Test Suite CA' - - pos_rights globus CA:sign - - cond_subjects globus '"/O=Grid/OU=GlobusTest/OU=simpleCA-globus.org/*"' - -# end of EACL diff --git a/gridftp/server/test/dirt.sh.in b/gridftp/server/test/dirt.sh.in deleted file mode 100644 index f9787f7d31..0000000000 --- a/gridftp/server/test/dirt.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -DIRT_TIMESTAMP=@DIRT_TIMESTAMP@ -DIRT_BRANCH_ID=@DIRT_BRANCH_ID@ diff --git a/gridftp/server/test/gfork_be_conf.in b/gridftp/server/test/gfork_be_conf.in deleted file mode 100644 index 0db6bf7609..0000000000 --- a/gridftp/server/test/gfork_be_conf.in +++ /dev/null @@ -1,18 +0,0 @@ -service gridftp2 -{ - instances = 100 - log_level = 0 - env = GLOBUS_LOCATION=@GLOBUS_LOCATION@ - env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib - env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin - env += @SEC_ENVS@ - server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server - server_args = -i -aa -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/server.log - server_args += -d WARN -dn --disable-usage-stats - server_args += -ipc-interface 127.0.0.1 - nice = 10 - master = @GLOBUS_LOCATION@/sbin/gfs-gfork-master - master_args = -G @GSI@ - master_args += -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/master_be.log - master_args += -b @FE_CS@ -} diff --git a/gridftp/server/test/gfork_conf.in b/gridftp/server/test/gfork_conf.in deleted file mode 100644 index 467751aed9..0000000000 --- a/gridftp/server/test/gfork_conf.in +++ /dev/null @@ -1,17 +0,0 @@ -service gridftp2 -{ - instances = 100 - log_level = 0 - env = GLOBUS_LOCATION=@GLOBUS_LOCATION@ - env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib - env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin - env += @SEC_ENVS@ - server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server - server_args = -i -aa -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/server.log - server_args += -dsi remote -ia self -d WARN --disable-usage-stats - server_args += -control-interface 127.0.0.1 - nice = 10 - master = @GLOBUS_LOCATION@/sbin/gfs-gfork-master - master_args = -port @REG_PORT@ -G @GSI@ - master_args += -df @GLOBUS_LOCATION@/test/globus_gridftp_server_test/master_gridmap -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/master.log -} diff --git a/gridftp/server/test/gfork_mem_conf.in b/gridftp/server/test/gfork_mem_conf.in deleted file mode 100644 index f6a3095c9b..0000000000 --- a/gridftp/server/test/gfork_mem_conf.in +++ /dev/null @@ -1,16 +0,0 @@ -service gridftp2 -{ - instances = 10 - log_level = 0 - env = GLOBUS_LOCATION=@GLOBUS_LOCATION@ - env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib - env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin - env += @SEC_ENVS@ - server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server - server_args = -i -aa -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/server.log - server_args += -d WARN -no-cas - nice = 10 - master = @GLOBUS_LOCATION@/sbin/gfs-gfork-master - master_args = -G @GSI@ -M 128M - master_args += -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/master.log -} diff --git a/gridftp/server/test/gfork_single_conf.in b/gridftp/server/test/gfork_single_conf.in deleted file mode 100644 index 0c6cd87895..0000000000 --- a/gridftp/server/test/gfork_single_conf.in +++ /dev/null @@ -1,17 +0,0 @@ -service gridftp2 -{ - instances = 100 - log_level = 0 - env = GLOBUS_LOCATION=@GLOBUS_LOCATION@ - env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib - env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin - env += @SEC_ENVS@ - server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server - server_args = -i -aa -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/server.log - server_args += -d WARN --disable-usage-stats - server_args += -control-interface 127.0.0.1 - nice = 10 - master = @GLOBUS_LOCATION@/sbin/gfs-gfork-master - master_args = -G @GSI@ - master_args += -l @GLOBUS_LOCATION@/test/globus_gridftp_server_test/master.log -} diff --git a/gridftp/server/test/gfs_common.pl.in b/gridftp/server/test/gfs_common.pl.in deleted file mode 100644 index 72358c9355..0000000000 --- a/gridftp/server/test/gfs_common.pl.in +++ /dev/null @@ -1,432 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -use Globus::Core::Paths; - -require 5.005; - -my $server_prog = "$Globus::Core::Paths::sbindir/globus-gridftp-server"; -my $gfork_prog = "$Globus::Core::Paths::sbindir/gfork"; -my @cleanup_pids; -my @cleanup_files; -my $gfs_working_dir="$Globus::Core::Paths::exec_prefix/test/globus_gridftp_server_test"; -my $gfs_subject; -my $g_server_args="-disable-usage-stats -no-fork -control-interface 127.0.0.1 -c none"; - -sub gfs_next_test() -{ - my $test_ndx = shift; - my $pid = -1; - my $cs = ""; - - $test_ndx = $test_ndx + 1; - gfs_cleanup(); - - if($ENV{GRID_FTP_SERVER_CS}) - { - $cs = $ENV{GRID_FTP_SERVER_CS}; - if($test_ndx == 1) - { - return -1,$cs,$test_ndx; - } - else - { - return -1,$cs,-1; - } - } - - if($test_ndx == 1) - { - print "Using basic server config\n"; - ($pid,$cs) = gfs_setup_server_basic(); - } - elsif($test_ndx == 2 && defined($ENV{GLOBUS_TEST_EXTENDED})) - { - print "Using single gfork server config\n"; - ($pid,$cs) = gfs_setup_server_fe(); - } - elsif($test_ndx == 3 && defined($ENV{GLOBUS_TEST_EXTENDED})) - { - print "Using gfork split server config\n"; - ($pid,$cs) = gfs_setup_server_split(1); - } - elsif($test_ndx == 4 && defined($ENV{GLOBUS_TEST_EXTENDED})) - { - print "Using gfork split server 2 stripes\n"; - ($pid,$cs) = gfs_setup_server_split(2); - } - elsif($test_ndx == 5 && defined($ENV{GLOBUS_TEST_EXTENDED})) - { - print "Using gfork split server 3 stripes\n"; - ($pid,$cs) = gfs_setup_server_split(3); - } - else - { - $test_ndx = -1; - print "No more tests.\n"; - return $pid,$cs,$test_ndx; - } - - print "Setting up src/dst server on $cs\n"; - - $cs =~ s/.*:/localhost:/; - - $ENV{FTP_TEST_SOURCE_HOST} = $cs; - $ENV{FTP_TEST_DEST_HOST} = $cs; - - return $pid,$cs,$test_ndx; -} - -sub gfs_cleanup() -{ - my $pid; - - kill 2, @cleanup_pids; - sleep 5; - kill 9, @cleanup_pids; - while($#cleanup_files > 0) - { - $pid = pop(@cleanup_files); - close($pid); - } -} - -# run the server in basic mode -sub gfs_setup_server_basic() -{ - my $server_pid; - my $server_port; - my $server_host = "localhost"; - my $server_args = " -aa "; - my $subject; - my $server_fd; - - my $server_args = "-no-chdir -d 0 ".$server_args." ".$g_server_args; - - print "$server_prog $server_args\n"; - $server_pid = open($server_fd, "$server_prog $server_args |"); - if($server_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - push(@cleanup_files, $server_fd); - - select((select($server_fd), $| = 1)[0]); - $server_port = <$server_fd>; - $server_port =~ s/Server listening at //; - chomp($server_port); - - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - - print "Started server at port $server_port\n"; - - $ENV{FTP_TEST_SOURCE_HOST} = "$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_port"; - - sleep 1; - - push(@cleanup_pids, $server_pid); - - return $server_pid, $server_port; -} - -sub gfs_setup_security_env() -{ - my $subject; - - if($ENV{FTP_TEST_NO_GSI} == 1) - { - return; - } - - if(0 != system("grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) - { - $ENV{X509_CERT_DIR} = $gfs_working_dir; - $ENV{X509_USER_PROXY} = $gfs_working_dir . "/testcred.pem"; - - my $cmd = "chmod 600 $ENV{X509_USER_PROXY}"; - system($cmd); - } - - system('chmod go-rw testcred.pem'); - - $subject = `grid-proxy-info -identity`; - chomp($subject); - $gfs_subject = $subject; - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - - $ENV{GRIDMAP} = $gfs_working_dir . "/gridmap"; - if ( -f $ENV{GRIDMAP}) - { - system('mv $GRIDMAP $GRIDMAP.old'); - } - if( 0 != system("grid-mapfile-add-entry -dn \"$subject\" -ln `whoami` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - - return $subject; -} - -sub gfs_setup_server_fe() -{ - my $gfork_prog = "$Globus::Core::Paths::sbindir/gfork"; - my $gfork_pid; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - my $use_gsi_opt; - my $register_args; - my $server_fd; - - if($ENV{FTP_TEST_NO_GSI} == 1) - { - $server_nosec = "-aa"; - } - - my $gfork_single_conf = $gfs_working_dir . "/gfork_single_conf"; - $master_gmap = $ENV{GRIDMAP}; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if($ENV{FTP_TEST_NO_GSI} == 1) - { - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - - $subject = $gfs_subject; - - $use_gsi_opt = "y"; - $register_args = "-q -G y"; - } - else - { - $register_args = "-q -G n"; - $use_gsi_opt = "n"; - } - - open(IN, "<$gfork_single_conf.in") || die "couldnt open $gfork_single_conf.in"; - open(OUT, ">$gfork_single_conf") || die "couldnt open $gfork_single_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - print OUT $x; - close(IN); - close(OUT); - - print "Starting $gfork_prog -c $gfork_single_conf\n"; - $gfork_pid = open($server_fd, "$gfork_prog -c $gfork_single_conf |"); - if($gfork_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - push(@cleanup_files, $server_fd); - select((select($server_fd), $| = 1)[0]); - $server_port = <$server_fd>; - $server_port =~ s/Listening on: //; - chomp($server_port); - print "Started gfork on port $server_port\n"; - - sleep 1; - push(@cleanup_pids, $gfork_pid); - - $ENV{FTP_TEST_SOURCE_HOST} = "$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_port"; - - return $gfork_pid,$server_port; -} - - -sub gfs_setup_server_split() -{ - my $gfork_be_port; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - my $server_be_port; - my $use_gsi_opt; - my $gfork_pid; - my $be_count = shift; - my $server_fd; - - if($ENV{FTP_TEST_NO_GSI} == 1) - { - $server_nosec = "-aa"; - } - - my $gfork_conf = $gfs_working_dir . "/gfork_conf"; - $master_gmap = $ENV{GRIDMAP}; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if(!defined($ENV{FTP_TEST_NO_GSI} || $ENV{FTP_TEST_NO_GSI} != 1)) - { - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - - $subject = $gfs_subject; - - $use_gsi_opt = "y"; - } - else - { - $use_gsi_opt = "n"; - } - - # XXX will this due? - my $reg_port = 8000 + int(rand(1000)); - - # sub in the name for frontend - open(IN, "<$gfork_conf.in") || die "couldnt open $gfork_conf.in"; - open(OUT, ">$gfork_conf") || die "couldnt open $gfork_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@REG_PORT@/$reg_port/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - print OUT $x; - close(IN); - close(OUT); - - print "starting $gfork_prog -c $gfork_conf\n"; - $gfork_pid = open($server_fd, "$gfork_prog -c $gfork_conf |"); - if($gfork_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - push(@cleanup_files, $server_fd); - select((select($server_fd), $| = 1)[0]); - $server_port = <$server_fd>; - my $fe_cs = $server_port; - $fe_cs =~ s/Listening on: //; - $server_port = $fe_cs; - chomp($server_port); - print "Started gfork on port $server_port\n"; - push(@cleanup_pids, $gfork_pid); - - # make sure it all gets loaded before starting the backends - sleep 5; - - my $gfork_be_pid; - my $server_be_port; - my $be_handle; - - for(my $i=0; $i < $be_count; $i++) - { - ($gfork_be_pid, $server_be_port, $be_handle) = gfs_setup_server_be($reg_port); - - push(@cleanup_files, $be_handle); - } - - return $gfork_pid,$server_port; -} - - -sub gfs_setup_server_be() -{ - my $gfork_be_port; - my $gfork_be_pid; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - my $server_be_port; - my $use_gsi_opt; - my $reg_port = shift; - my $gfork_be_conf = $gfs_working_dir . "/gfork_be_conf"; - - my $fe_cs = "localhost:$reg_port"; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if(!defined($ENV{FTP_TEST_NO_GSI} || $ENV{FTP_TEST_NO_GSI} != 1)) - { - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - - $subject = $gfs_subject; - - $use_gsi_opt = "y"; - } - else - { - $use_gsi_opt = "n"; - } - - - open(IN, "<$gfork_be_conf.in") || die "couldnt open $gfork_be_conf.in"; - open(OUT, ">$gfork_be_conf") || die "couldnt open $gfork_be_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - $x =~ s/\@FE_CS@/$fe_cs/g; - print OUT $x; - close(IN); - close(OUT); - - my $be_handle; - print "starting $gfork_prog -c $gfork_be_conf\n"; - $gfork_be_pid = open($be_handle, "$gfork_prog -c $gfork_be_conf |"); - if($gfork_be_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - print "Reading port from be\n"; - select((select($be_handle), $| = 1)[0]); - $server_be_port = <$be_handle>; - chomp($server_be_port); - print "Started gfork backend on port $server_be_port\n"; - push(@cleanup_pids, $gfork_be_pid); - - sleep 5; - - return $gfork_be_pid,$server_be_port,$be_handle; -} - -1; diff --git a/gridftp/server/test/globus-gridftp-be-gfork.pl.in b/gridftp/server/test/globus-gridftp-be-gfork.pl.in deleted file mode 100644 index 7a4884f83d..0000000000 --- a/gridftp/server/test/globus-gridftp-be-gfork.pl.in +++ /dev/null @@ -1,239 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -use Globus::Core::Paths; - -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -my $nogsi; -my $gfork_pid; -my $gfork_be_pid; - -if(defined($nogsi) or defined($ENV{FTP_TEST_NO_GSI})) -{ - $nogsi = 1; - $ENV{FTP_TEST_NO_GSI} = 1; - print "Not using GSI security.\n"; -} - -&setup_server(); -if((0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) && !defined($nogsi)) -{ - print "Security proxy required to run the tests.\n"; - exit 1; -} - -# start registration program -my $done = 0; -$SIG{ALRM} = \&eatfd_db; -alarm 20; - - -# run tests -print "starting tests\n"; - -my $rc = system("cd $Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test; ./globus-ftp-client-run-tests.pl"); - -print "tests done\n"; -$done = 1; -alarm 0; -&clean_up(); -exit $rc; - -sub eatfd_db() -{ - my $junk = ; - $junk = ; - if($done == 0) - { - $SIG{ALRM} = \&eatfd_db; - alarm 20; - } -} - -sub clean_up() -{ - print "Cleaning up $gfork_be_pid and $gfork_pid\n"; - if($gfork_be_pid) - { - kill(9,-$gfork_be_pid); - $gfork_be_pid=0; - } - if($gfork_pid) - { - kill(9,-$gfork_pid); - $gfork_pid=0; - } -} - -sub setup_server() -{ - my $gfork_prog = "$Globus::Core::Paths::sbindir/gfork"; - my $gfork_be_prog = "$Globus::Core::Paths::sbindir/gfork"; - my $gfork_be_port; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - my $server_be_port; - - if(defined($nogsi)) - { - $server_nosec = "-aa"; - } - - my $gfork_conf = cwd() . "/gfork_conf"; - my $gfork_be_conf = cwd() . "/gfork_be_conf"; - $master_gmap = "$Globus::Core::Paths::exec_prefix/test/globus_gridftp_server_test/master_gridmap"; - - $ENV{GRIDMAP} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/gridmap"; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if(!defined($nogsi)) - { - if(0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) - { - $ENV{X509_CERT_DIR} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test"; - $ENV{X509_USER_PROXY} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/testcred.pem"; - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - } - - my $cmd = "chmod go-rw $Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/testcred.pem" ; - system($cmd); - - $subject = `$Globus::Core::Paths::bindir/grid-proxy-info -identity`; - chomp($subject); - - if ( -f $ENV{GRIDMAP}) - { - system('mv $GRIDMAP $GRIDMAP.old'); - } - if( 0 != system("$Globus::Core::Paths::sbindir/grid-mapfile-add-entry -dn \"$subject\" -ln `whoami` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - - if( 0 != system("cp $ENV{GRIDMAP} $master_gmap") / 256) - { - print "Unable to create master gridmap file\n"; - exit 1; - } - - $use_gsi_opt = "y"; - } - else - { - $use_gsi_opt = "n"; - } - - - my $reg_port = 8000 + int(rand(1000)); - - # sub in the name for frontend - open(IN, "<$gfork_conf.in") || die "couldnt open $gfork_conf.in"; - open(OUT, ">$gfork_conf") || die "couldnt open $gfork_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@REG_PORT@/$reg_port/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - print OUT $x; - close(IN); - close(OUT); - - print "starting $gfork_prog -c $gfork_conf\n"; - $gfork_pid = open(SERVER, "$gfork_prog -c $gfork_conf |"); - if($gfork_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - select((select(SERVER), $| = 1)[0]); - $server_port = ; - my $fe_cs = $server_port; - $fe_cs =~ s/Listening on: //; - $server_port =~ s/Listening on: .*?:(\d+)/\1/; - chomp($server_port); - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - print "Started gfork on port $server_port\n"; - - # sub in the name for frontend - - $fe_cs = "localhost:$reg_port"; - open(IN, "<$gfork_be_conf.in") || die "couldnt open $gfork_be_conf.in"; - open(OUT, ">$gfork_be_conf") || die "couldnt open $gfork_be_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - $x =~ s/\@FE_CS@/$fe_cs/g; - print OUT $x; - close(IN); - close(OUT); - - sleep 15; - - print "starting $gfork_be_prog -c $gfork_be_conf\n"; - $gfork_be_pid = open(BE_SERVER, "$gfork_be_prog -c $gfork_be_conf |"); - if($gfork_be_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - select((select(BE_SERVER), $| = 1)[0]); - $server_be_port = ; - $server_be_port =~ s/Listening on: .*?:(\d+)/\1/; - chomp($server_be_port); - if($server_be_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - print "Started gfork backend on port $server_be_port\n"; - - - # sleep a second, some hosts are slow.... - - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - $ENV{FTP_TEST_SOURCE_HOST} = "$server_host:$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_host:$server_port"; - - sleep 5; - - return; -} diff --git a/gridftp/server/test/globus-gridftp-dyn-be.pl.in b/gridftp/server/test/globus-gridftp-dyn-be.pl.in deleted file mode 100644 index 93ee524249..0000000000 --- a/gridftp/server/test/globus-gridftp-dyn-be.pl.in +++ /dev/null @@ -1,232 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -my $nogsi; -my $register_args = " -q "; -my $be_pid; -my $be_cmd; -my $gfork_pid; - -if(defined($nogsi) or defined($ENV{FTP_TEST_NO_GSI})) -{ - $nogsi = 1; - $ENV{FTP_TEST_NO_GSI} = 1; - print "Not using GSI security.\n"; -} - - -push(@INC, $ENV{GLOBUS_LOCATION} . "/lib/perl"); - -&setup_server(); -if((0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) && !defined($nogsi)) -{ - print "Security proxy required to run the tests.\n"; - exit 1; -} - -# start registration program -$be_cmd = "$Globus::Core::Paths::libexecdir/gfs-dynbe-client $register_args"; -print "registering be: $be_cmd\n"; -®ister_db(); -$SIG{ALRM} = \®ister_db; -#alarm 60; - -# run tests -print "starting tests\n"; - -my $rc; -my $rc = system("cd $Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test; ./globus-ftp-client-run-tests.pl"); - -&clean_up(); - -exit $rc; - -sub clean_up() -{ - if($be_pid) - { - kill(9,-$be_pid); - $be_pid=0; - } - if($gfork_pid) - { - kill(9,-$gfork_pid); - $gfork_pid=0; - } -} - - -sub register_db() -{ - my $rc; - - $rc = system("$Globus::Core::Paths::libexecdir/gfs-dynbe-client $register_args ") / 256; - - if($rc != 0) - { - print "Failed to register backend\n"; - &clean_up(); - exit 1; - } - $SIG{ALRM} = \®ister_db; - alarm 60; -} - -sub setup_server() -{ - my $gfork_prog = "$Globus::Core::Paths::sbindir/gfork"; - my $be_prog = "$Globus::Core::Paths::sbindir/globus-gridftp-server"; - my $be_args = "-dn -aa"; - my $be_port; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - - if(defined($nogsi)) - { - $server_nosec = "-aa"; - } - - my $gfork_conf = cwd() . "/gfork_conf"; - $master_gmap = "$Globus::Core::Paths::exec_prefix/test/globus_gridftp_server_test/master_gridmap"; - - $ENV{GRIDMAP} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/gridmap"; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if(!defined($nogsi)) - { - if(0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) - { - $ENV{X509_CERT_DIR} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test"; - $ENV{X509_USER_PROXY} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/testcred.pem"; - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - } - - my $cmd = "chmod go-rw $Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/testcred.pem" ; - system($cmd); - - $subject = `$Globus::Core::Paths::bindir/grid-proxy-info -identity`; - chomp($subject); - - if ( -f $ENV{GRIDMAP}) - { - system('mv $GRIDMAP $GRIDMAP.old'); - } - if( 0 != system("$Globus::Core::Paths::sbindir/grid-mapfile-add-entry -dn \"$subject\" -ln `whoami` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - - if( 0 != system("cp $ENV{GRIDMAP} $master_gmap") / 256) - { - print "Unable to create master gridmap file\n"; - exit 1; - } - - $use_gsi_opt = "y"; - $register_args = "-q -G y"; - } - else - { - $register_args = "-q -G n"; - $use_gsi_opt = "n"; - } - - - my $reg_port = 8000 + int(rand(1000)); - - # sub in the files - open(IN, "<$gfork_conf.in") || die "couldnt open $gfork_conf.in"; - open(OUT, ">$gfork_conf") || die "couldnt open $gfork_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@REG_PORT@/$reg_port/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - print OUT $x; - close(IN); - close(OUT); - - print "starting $gfork_prog -c $gfork_conf\n"; - $gfork_pid = open(SERVER, "$gfork_prog -c $gfork_conf |"); - if($gfork_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - select((select(SERVER), $| = 1)[0]); - $server_port = ; - $server_port =~ s/Listening on: .*?:(\d+)/\1/; - chomp($server_port); - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - print "Started gfork on port $server_port\n"; - - print "starting $be_prog $be_args\n"; - $be_pid = open(BE_SERVER, "$be_prog $be_args |"); - if($be_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - select((select(BE_SERVER), $| = 1)[0]); - $be_port = ; - $be_port =~ s/Server listening at .*?:(\d+)/\1/; - chomp($be_port); - if($be_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - print "Started backend on port $be_port\n"; - - # sleep a second, some hosts are slow.... - - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - $ENV{FTP_TEST_SOURCE_HOST} = "$server_host:$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_host:$server_port"; - - sleep 5; - - $register_args = $register_args . " localhost:$be_port localhost:$reg_port"; - - return; -} - diff --git a/gridftp/server/test/globus-gridftp-gfork-fe.pl.in b/gridftp/server/test/globus-gridftp-gfork-fe.pl.in deleted file mode 100644 index e291d9ef69..0000000000 --- a/gridftp/server/test/globus-gridftp-gfork-fe.pl.in +++ /dev/null @@ -1,187 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -use Globus::Core::Paths; - -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -my $nogsi; -my $register_args = " -q "; -my $be_pid; -my $be_cmd; -my $gfork_pid; - -if(defined($nogsi) or defined($ENV{FTP_TEST_NO_GSI})) -{ - $nogsi = 1; - $ENV{FTP_TEST_NO_GSI} = 1; - print "Not using GSI security.\n"; -} - - -push(@INC, $ENV{GLOBUS_LOCATION} . "/lib/perl"); - -&setup_server(); -if((0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) && !defined($nogsi)) -{ - print "Security proxy required to run the tests.\n"; - exit 1; -} - -#$SIG{ALRM} = \&eatfd_db; -#alarm 20; - -my $rc; -my $rc = system("cd $Globus::Core::Paths:exec_prefix/test/globus_ftp_client_test; ./globus-ftp-client-run-tests.pl"); - -exit $rc; - -#sub eatfd_db() -#{ -# my $junk = ; -# $SIG{ALRM} = \&eatfd_db; -# alarm 20; -#} - -sub clean_up() -{ - if($be_pid) - { - kill(9,-$be_pid); - $be_pid=0; - } - if($gfork_pid) - { - kill(9,-$gfork_pid); - $gfork_pid=0; - } -} - -sub setup_server() -{ - my $gfork_prog = "$Globus::Core::Paths::sbindir/gfork"; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - - if(defined($nogsi)) - { - $server_nosec = "-aa"; - } - - my $gfork_single_conf = cwd() . "/gfork_single_conf"; - $master_gmap = "$Globus::Core::Paths::exec_prefix/test/globus_gridftp_server_test/master_gridmap"; - - $ENV{GRIDMAP} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/gridmap"; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if(!defined($nogsi)) - { - if(0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) - { - $ENV{X509_CERT_DIR} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test"; - $ENV{X509_USER_PROXY} = "$Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/testcred.pem"; - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - } - - my $cmd = "chmod go-rw $Globus::Core::Paths::exec_prefix/test/globus_ftp_client_test/testcred.pem" ; - system($cmd); - - $subject = `grid-proxy-info -identity`; - chomp($subject); - - if ( -f $ENV{GRIDMAP}) - { - system('mv $GRIDMAP $GRIDMAP.old'); - } - if( 0 != system("$Globus::Core::Paths::sbindir/grid-mapfile-add-entry -dn \"$subject\" -ln `whoami` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - - if( 0 != system("cp $ENV{GRIDMAP} $master_gmap") / 256) - { - print "Unable to create master gridmap file\n"; - exit 1; - } - - $use_gsi_opt = "y"; - $register_args = "-q -G y"; - } - else - { - $register_args = "-q -G n"; - $use_gsi_opt = "n"; - } - - - open(IN, "<$gfork_single_conf.in") || die "couldnt open $gfork_single_conf.in"; - open(OUT, ">$gfork_single_conf") || die "couldnt open $gfork_single_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - print OUT $x; - close(IN); - close(OUT); - - print "starting $gfork_prog -c $gfork_single_conf\n"; - $gfork_pid = open(SERVER, "$gfork_prog -c $gfork_single_conf |"); - if($gfork_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - select((select(SERVER), $| = 1)[0]); - $server_port = ; - $server_port =~ s/Listening on: .*?:(\d+)/\1/; - chomp($server_port); - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - print "Started gfork on port $server_port\n"; - - # sleep a second, some hosts are slow.... - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - $ENV{FTP_TEST_SOURCE_HOST} = "$server_host:$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_host:$server_port"; - - sleep 5; - - return; -} - diff --git a/gridftp/server/test/globus-gridftp-gfork-mem.pl.in b/gridftp/server/test/globus-gridftp-gfork-mem.pl.in deleted file mode 100644 index 66d877b169..0000000000 --- a/gridftp/server/test/globus-gridftp-gfork-mem.pl.in +++ /dev/null @@ -1,219 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -@GLOBUS_PERL_INITIALIZER@ - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -my $nogsi; -my $register_args = " -q "; -my $be_cmd; -my $gfork_pid; - -if(defined($nogsi) or defined($ENV{FTP_TEST_NO_GSI})) -{ - $nogsi = 1; - $ENV{FTP_TEST_NO_GSI} = 1; - print "Not using GSI security.\n"; -} - - -push(@INC, $ENV{GLOBUS_LOCATION} . "/lib/perl"); - -my $port = &setup_server(); -if((0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) && !defined($nogsi)) -{ - print "Security proxy required to run the tests.\n"; - exit 1; -} - -#$SIG{ALRM} = \&eatfd_db; -#alarm 20; - -my $rc; -my $cmd = "$Globus::Core::Paths::bindir/globus-url-copy -v -len 315621376 -tcp-bs 16777216 -rst -rst-retries 0 -rst-interval 1 ftp://localhost:$port/dev/zero file:///dev/null"; - -my @a; -my $pid; -for(my $i = 0; $i <= 20; $i++) -{ - unless ($pid = fork) - { - exec ($cmd) or print STDERR "couldn't exec $cmd: $!"; - die "no exec"; - # ... or ... - ## (some_perl_code_here) - exit 0; - } - - push(@a, $pid); -} - -$|=1; -foreach(@a) -{ - $pid = $_; - - waitpid($pid, 0); - $rc = $?; - if($rc != 0) - { - print "processes $pid failed!\n"; - } - else - { - print "."; - } -} -print "\n"; - -&clean_up(); - -exit $rc; - -#sub eatfd_db() -#{ -# my $junk = ; -# $SIG{ALRM} = \&eatfd_db; -# alarm 20; -#} - -sub clean_up() -{ - if($gfork_pid) - { - print "Killing gfork pid group: $gfork_pid\n"; - - kill(15, $gfork_pid); - kill(15, $gfork_pid+1); # this has to be naughty - $gfork_pid=0; - } -} - -sub setup_server() -{ - my $gfork_prog = "$Globus::Core::Paths::sbindir/gfork"; - my $testdir = "$Globus::Core::Paths::exec_prefix/test"; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - my $use_gsi_opt; - my $master_gmap; - my $x; - my $sec_envs; - - if(defined($nogsi)) - { - $server_nosec = "-aa"; - } - - my $gfork_mem_conf = cwd() . "/gfork_mem_conf"; - $master_gmap = "$testdir/globus_gridftp_server_test/master_gridmap"; - - $ENV{GRIDMAP} = "$testdir/globus_ftp_client_test/gridmap"; - - $sec_envs = "GRIDMAP=$ENV{GRIDMAP}"; - if(!defined($nogsi)) - { - if(0 != system("$Globus::Core::Paths::bindir/grid-proxy-info -exists -hours 2 >/dev/null 2>&1") / 256) - { - $ENV{X509_CERT_DIR} = "$testdir/globus_ftp_client_test"; - $ENV{X509_USER_PROXY} = "$testdir/globus_ftp_client_test/testcred.pem"; - $sec_envs = "$sec_envs\n env += X509_CERT_DIR=$ENV{X509_CERT_DIR}"; - $sec_envs = "$sec_envs\n env += X509_USER_PROXY=$ENV{X509_USER_PROXY}"; - $sec_envs = "$sec_envs\n env += X509_USER_CERT=$ENV{X509_USER_PROXY}"; - } - - my $cmd = "chmod go-rw $testdir/globus_ftp_client_test/testcred.pem" ; - system($cmd); - - $subject = `$Globus::Core::Paths::bindir/grid-proxy-info -identity`; - chomp($subject); - - if ( -f $ENV{GRIDMAP}) - { - system('mv $GRIDMAP $GRIDMAP.old'); - } - if( 0 != system("$Globus::Core::Paths::sbindir/grid-mapfile-add-entry -dn \"$subject\" -ln `whoami` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - - if( 0 != system("cp $ENV{GRIDMAP} $master_gmap") / 256) - { - print "Unable to create master gridmap file\n"; - exit 1; - } - - $use_gsi_opt = "y"; - $register_args = "-q -G y"; - } - else - { - $register_args = "-q -G n"; - $use_gsi_opt = "n"; - } - - - open(IN, "<$gfork_mem_conf.in") || die "couldnt open $gfork_mem_conf.in"; - open(OUT, ">$gfork_mem_conf") || die "couldnt open $gfork_mem_conf"; - $x = join('', ); - $x =~ s/\@GLOBUS_LOCATION@/$Globus::Core::Paths::prefix/g; - $x =~ s/\@GSI@/$use_gsi_opt/g; - $x =~ s/\@SEC_ENVS@/$sec_envs/g; - print OUT $x; - close(IN); - close(OUT); - - print "starting $gfork_prog -c $gfork_mem_conf\n"; - $gfork_pid = open(SERVER, "$gfork_prog -c $gfork_mem_conf |"); - if($gfork_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - select((select(SERVER), $| = 1)[0]); - $server_port = ; - $server_port =~ s/Listening on: .*?:(\d+)/\1/; - chomp($server_port); - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - print "Started gfork on port $server_port\n"; - - # sleep a second, some hosts are slow.... - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - $ENV{FTP_TEST_SOURCE_HOST} = "$server_host:$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_host:$server_port"; - - sleep 5; - - return $server_port; -} - diff --git a/gridftp/server/test/globus_gridftp_register.c b/gridftp/server/test/globus_gridftp_register.c deleted file mode 100644 index 28731a8470..0000000000 --- a/gridftp/server/test/globus_gridftp_register.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright 1999-2006 University of Chicago - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "globus_xio.h" -#include "globus_xio_tcp_driver.h" - -#define LINE_LEN 1024 - -void -test_res( - globus_result_t res) -{ - if(res == GLOBUS_SUCCESS) - { - return; - } - - fprintf(stderr, "ERROR: %s\n", globus_object_printable_to_string( - globus_error_get(res))); - - globus_assert(0); -} - -void -help() -{ - fprintf(stdout, "globus-gridftp-register []\n"); -} - -int -main( - int argc, - char ** argv) -{ - int arg_i = 0; - int c_count; - globus_xio_driver_t tcp_driver; - globus_xio_driver_t gsi_driver; - globus_xio_stack_t stack; - globus_xio_handle_t xio_handle; - char * cs; - char * repo; - char * registry_cs; - globus_result_t res; - char msg[256]; - globus_size_t nbytes; - int len; - char * local_contact; - char * tmp_ptr; - - if(argc < 4) - { - help(); - return 1; - } - - globus_module_activate(GLOBUS_XIO_MODULE); - globus_xio_stack_init(&stack, NULL); - - res = globus_xio_driver_load("tcp", &tcp_driver); - test_res(res); - res = globus_xio_stack_push_driver(stack, tcp_driver); - test_res(res); - - arg_i = 1; - if(strcmp(argv[arg_i], "-s") == 0) - { - arg_i++; - res = globus_xio_driver_load("gsi", &gsi_driver); - test_res(res); - res = globus_xio_stack_push_driver(stack, gsi_driver); - test_res(res); - } - registry_cs = argv[arg_i]; - arg_i++; - cs = argv[arg_i]; - arg_i++; - c_count = atoi(argv[arg_i]); - arg_i++; - - if(arg_i == argc) - { - repo = ""; - } - else - { - repo = argv[arg_i]; - } - res = globus_xio_handle_create(&xio_handle, stack); - test_res(res); - - res = globus_xio_open(xio_handle, registry_cs, NULL); - test_res(res); - - res = globus_xio_handle_cntl( - xio_handle, - tcp_driver, - GLOBUS_XIO_TCP_GET_LOCAL_CONTACT, - &local_contact); - test_res(res); - - tmp_ptr = strchr(local_contact, ':'); - assert(tmp_ptr != NULL); - *tmp_ptr = '\0'; - printf("%s\n", local_contact); /* write out the actual IP we will use */ - - memset(msg, '\0', 256); - len = strlen(repo); - *msg = (char)c_count; - memcpy(&msg[1], repo, len); - msg[len+1] = '\0'; - sprintf(&msg[len+2], "%s:%s", local_contact, cs); - printf("registering\n repo=[%s]\n server contact=[%s]\n max=[%d]\n", - repo, &msg[len+2], c_count); - res = globus_xio_write(xio_handle, msg, 256, 256, &nbytes, NULL); - test_res(res); - - globus_xio_close(xio_handle, NULL); - - globus_module_activate(GLOBUS_XIO_MODULE); - - return 0; -} diff --git a/gridftp/server/test/testcred.pem b/gridftp/server/test/testcred.pem deleted file mode 100644 index ec0090d34c..0000000000 --- a/gridftp/server/test/testcred.pem +++ /dev/null @@ -1,39 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUzCCAbygAwIBAgIEJCD+RTANBgkqhkiG9w0BAQQFADBzMQ0wCwYDVQQKEwRH -cmlkMRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVDQS1nbG9i -dXMub3JnMRQwEgYDVQQLEwttY3MuYW5sLmdvdjEZMBcGA1UEAxMQVGVzdCBDZXJ0 -aWZpY2F0ZTAeFw0wMzA2MDYyMjE2NDNaFw0wODA2MjkwMTA4NTZaMIGHMQ0wCwYD -VQQKEwRHcmlkMRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVD -QS1nbG9idXMub3JnMRQwEgYDVQQLEwttY3MuYW5sLmdvdjEZMBcGA1UEAxMQVGVz -dCBDZXJ0aWZpY2F0ZTESMBAGA1UEAxMJNjA2MTQyMDIxMFwwDQYJKoZIhvcNAQEB -BQADSwAwSAJBALsu0b7PFQqrOTy+THd4AEbFvbgLZsI3q+myUAU4bL2XYYwpbFR9 -OPRAWGCgFosBz/nEVkFXKV0VDurKEW4/ZssCAwEAAaMjMCEwHwYKKwYBBAGbUAGB -XgEB/wQOMAwwCgYIKwYBBQUHFQEwDQYJKoZIhvcNAQEEBQADgYEAH7Guq7hop+Td -gqknZv7XwqKfzpeTXl5sAJXwzUSMoxOsOFuE3MxdaKM2lXBStX8FHGrvevXbVSvL -z+KUpPBRAvSfoZlMLJLnqCxW1Y2GeExg66lzH4AQF0hCzW/r9SjblCvHZDzoy/Kd -yLnUWbDhwk2YfyIcBKtxZ8kHwVUbUjg= ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIIBOQIBAAJBALsu0b7PFQqrOTy+THd4AEbFvbgLZsI3q+myUAU4bL2XYYwpbFR9 -OPRAWGCgFosBz/nEVkFXKV0VDurKEW4/ZssCAwEAAQJAA/G/n7qzYc8r3JjR+a6A -qv0du1QaLTuJFtqYDxQaToBp2FDUFTHlAGrKKB4eBAsSVsYBy0/uetAxPKJdK7HV -OQIhAPTBB/vpG/qtbsxyFIzHybo2GGv2TrjGm93hgIivwq8fAiEAw8iYj19VtrYU -uwihwhYQh5yt2V1vi7MU5UA7S+5QDtUCIFxrg4NJK+qFkOAcd8wNKQxqnuAtmt5F -CNhI7YsvqzkLAiA6o6E2B/rXL7AD2PEB/bPTulTDrt2S/P88LsHT2zv1RQIgayqn -oTDyUE/r4w7mEtYSf83SbMhbfdqduoo8ao7VNvI= ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIICXzCCAcigAwIBAgIBAjANBgkqhkiG9w0BAQQFADBhMQ0wCwYDVQQKEwRHcmlk -MRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVDQS1nbG9idXMu -b3JnMR0wGwYDVQQDExRHbG9idXMgVGVzdCBTdWl0ZSBDQTAeFw0wMzA2MDYwMTA4 -NTZaFw0wODA2MjkwMTA4NTZaMHMxDTALBgNVBAoTBEdyaWQxEzARBgNVBAsTCkds -b2J1c1Rlc3QxHDAaBgNVBAsTE3NpbXBsZUNBLWdsb2J1cy5vcmcxFDASBgNVBAsT -C21jcy5hbmwuZ292MRkwFwYDVQQDExBUZXN0IENlcnRpZmljYXRlMIGfMA0GCSqG -SIb3DQEBAQUAA4GNADCBiQKBgQDXxrOVnZGWf6g8G9Qou7B01KLOf10HrcmxbBxU -/gtHMNSB7pQS2BYO4ZuyGTzYQH7P1R3cx3D5qnern+gXW0bVL4AdDZyho9KzUTos -uPuk2Y1eAqkaeFGo5ZhgRYnVhGD5bGRGMR+DNYDraC60+8KAnRUR+UyU9L4PkR7g -oAleHQIDAQABoxUwEzARBglghkgBhvhCAQEEBAMCBPAwDQYJKoZIhvcNAQEEBQAD -gYEAsO2WxL9QeNfPFpgKwfZVhWpkhqhXc+Hqf5+X05eLBLv+Nz11i8DKU9FYhqil -5kuB3sUJiDmYzNDN7ok4LrwUgHv+BPAyfid5aFz4POytHrazowVMobmiDB9+vR5k -qjaOhxU7F0ZinXz0luympwCco5a+/b2x1KZhB5lxzB2jF0w= ------END CERTIFICATE----- diff --git a/gridftp/server/test/xio_ftp.c b/gridftp/server/test/xio_ftp.c deleted file mode 100644 index 9cab766afb..0000000000 --- a/gridftp/server/test/xio_ftp.c +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright 1999-2006 University of Chicago - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "globus_xio.h" -#include "globus_xio_gssapi_ftp.h" - -#define LINE_LEN 1024 - -void -test_res( - globus_result_t res, - int line) -{ - if(res == GLOBUS_SUCCESS) - { - return; - } - - fprintf(stderr, "ERROR @ %d: %s\n", line, globus_error_print_chain( - globus_error_get(res))); - - globus_assert(0); -} - -globus_bool_t -is_full_reply( - const char * msg, - int length) -{ - char * tmp_ptr; - - if(msg[length-1] != '\n' || msg[length-2] != '\r') - { - return GLOBUS_FALSE; - } - - tmp_ptr =(char *) msg; - - while(1) - { - if(tmp_ptr[3] == ' ') - { - return GLOBUS_TRUE; - } - tmp_ptr = strstr(tmp_ptr, "\r\n"); - if(tmp_ptr == NULL) - { - return GLOBUS_FALSE; - } - *tmp_ptr = '^'; - tmp_ptr++; - *tmp_ptr = '^'; - tmp_ptr++; - if(tmp_ptr - msg >= length || *tmp_ptr == '\0') - { - return GLOBUS_FALSE; - } - } -} - - -int -main( - int argc, - char ** argv) -{ - int rc; - globus_xio_driver_t tcp_driver; - globus_xio_stack_t stack; - globus_xio_handle_t xio_handle; - globus_xio_attr_t attr; - char * cs; - globus_result_t res; - char line[LINE_LEN]; - globus_bool_t done = GLOBUS_FALSE; - int ndx; - int length; - globus_size_t nbytes; - globus_size_t size; - - globus_module_activate(GLOBUS_XIO_MODULE); - - res = globus_xio_driver_load("tcp", &tcp_driver); - test_res(res, __LINE__); - res = globus_xio_stack_init(&stack, NULL); - test_res(res, __LINE__); - res = globus_xio_stack_push_driver(stack, tcp_driver); - test_res(res, __LINE__); - - res = globus_xio_attr_init(&attr); - test_res(res, __LINE__); - - cs = argv[argc - 1]; - res = globus_xio_handle_create(&xio_handle, stack); - test_res(res, __LINE__); - - res = globus_xio_open(xio_handle, cs, attr); - test_res(res, __LINE__); - - length = 0; - while(!is_full_reply(line, length)) - { - res = globus_xio_read( - xio_handle, &line[length], LINE_LEN-length, 1, &nbytes, NULL); - length+=nbytes; - } - line[length] = '\0'; - printf(line); - - while(!done) - { - if(fgets(line, LINE_LEN, stdin) == NULL) - { - done = GLOBUS_TRUE; - } - else - { - if(strncasecmp(line, "QUIT", 4) == 0) - { - done = GLOBUS_TRUE; - } - ndx = strlen(line); - line[ndx-1] = '\r'; - line[ndx] = '\n'; - size = ndx+1; - res = globus_xio_write( - xio_handle, line, size, size, &nbytes, NULL); - test_res(res, __LINE__); - - length = 0; - while(!is_full_reply(line, length)) - { - res = globus_xio_read( - xio_handle, - &line[length], LINE_LEN-length, 1, &nbytes, NULL); - length+=nbytes; - } - line[length] = '\0'; - printf(line); - } - } - - res = globus_xio_close(xio_handle, NULL); - test_res(res, __LINE__); - - res = globus_xio_driver_unload(tcp_driver); - test_res(res, __LINE__); - - rc = globus_module_activate(GLOBUS_XIO_MODULE); - globus_assert(rc == GLOBUS_SUCCESS); - - return 0; -} From 34701f25f3f767f87efd427492d520515838c5b1 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 10 Mar 2020 17:16:20 +0100 Subject: [PATCH 2/5] Remove some unused test files --- common/source/test/TESTS.pl | 94 -------- .../source/configure.ac | 2 +- .../source/test/Makefile.am | 1 - .../source/test/TESTS.pl | 60 ----- .../register-refresh-credentials-test.pl | 72 ------ .../test/client/register-status-test.pl | 74 ------ gram/protocol/source/test/.gitignore | 1 - gridftp/client/source/configure.ac | 2 +- gridftp/client/source/test/FtpTestLib.pm | 2 - gridftp/client/source/test/Makefile.am | 2 +- gridftp/client/source/test/NOTES.win32 | 33 --- gridftp/client/source/test/TESTS-junit.pl | 45 ---- gridftp/client/source/test/TESTS.pl | 45 ---- gridftp/client/source/test/dc31a685.0 | 16 -- .../source/test/dc31a685.signing_policy | 33 --- gridftp/client/source/test/guctest.sh | 83 ------- gridftp/client/source/test/many-server.pl | 42 ---- .../client/source/test/run-backend-tests.pl | 225 ------------------ gridftp/client/source/test/run-tests.pl | 223 ----------------- gridftp/client/source/test/testcred.pem | 39 --- gsi/gssapi/source/test/gssapi-group-test.pl | 110 --------- gsi/proxy/proxy_ssl/source/configure.ac | 2 +- gsi/proxy/proxy_ssl/source/test/Makefile.am | 13 +- .../proxy_ssl/source/test/TESTS-junit.pl | 43 ---- gsi/proxy/proxy_ssl/source/test/TESTS.pl | 15 -- io/compat/test/TESTS-junit.pl | 59 ----- io/compat/test/TESTS.pl | 32 --- .../globus-ftp-client/debian/changelog.in | 6 + .../globus-gsi-proxy-ssl/debian/changelog.in | 6 + .../debian/changelog.in | 6 + packaging/fedora/globus-ftp-client.spec | 5 +- packaging/fedora/globus-gsi-proxy-ssl.spec | 5 +- .../globus-scheduler-event-generator.spec | 5 +- xio/src/test/TESTS-junit.pl | 92 ------- xio/src/test/TESTS.pl | 65 ----- xio/src/test/all_in_one.pl | 67 ------ xio/src/test/blocking-dd-test.pl | 76 ------ xio/src/test/close-barrier2-test.pl | 104 -------- xio/src/test/driver-test.pl | 95 -------- xio/src/test/run-all-tests.pl | 67 ------ xio/src/test/run-http-tests.pl | 55 ----- xio/src/test/run-xio-tests.pl | 63 ----- xio/src/test/threads-test.pl | 98 -------- 43 files changed, 36 insertions(+), 2147 deletions(-) delete mode 100755 common/source/test/TESTS.pl delete mode 100755 gram/jobmanager/scheduler_event_generator/source/test/TESTS.pl delete mode 100755 gram/jobmanager/source/test/client/register-refresh-credentials-test.pl delete mode 100755 gram/jobmanager/source/test/client/register-status-test.pl delete mode 100644 gridftp/client/source/test/NOTES.win32 delete mode 100755 gridftp/client/source/test/TESTS-junit.pl delete mode 100755 gridftp/client/source/test/TESTS.pl delete mode 100644 gridftp/client/source/test/dc31a685.0 delete mode 100644 gridftp/client/source/test/dc31a685.signing_policy delete mode 100755 gridftp/client/source/test/guctest.sh delete mode 100755 gridftp/client/source/test/many-server.pl delete mode 100755 gridftp/client/source/test/run-backend-tests.pl delete mode 100755 gridftp/client/source/test/run-tests.pl delete mode 100644 gridftp/client/source/test/testcred.pem delete mode 100755 gsi/gssapi/source/test/gssapi-group-test.pl delete mode 100755 gsi/proxy/proxy_ssl/source/test/TESTS-junit.pl delete mode 100644 gsi/proxy/proxy_ssl/source/test/TESTS.pl delete mode 100755 io/compat/test/TESTS-junit.pl delete mode 100755 io/compat/test/TESTS.pl delete mode 100755 xio/src/test/TESTS-junit.pl delete mode 100755 xio/src/test/TESTS.pl delete mode 100755 xio/src/test/all_in_one.pl delete mode 100755 xio/src/test/blocking-dd-test.pl delete mode 100755 xio/src/test/close-barrier2-test.pl delete mode 100755 xio/src/test/driver-test.pl delete mode 100755 xio/src/test/run-all-tests.pl delete mode 100755 xio/src/test/run-http-tests.pl delete mode 100755 xio/src/test/run-xio-tests.pl delete mode 100755 xio/src/test/threads-test.pl diff --git a/common/source/test/TESTS.pl b/common/source/test/TESTS.pl deleted file mode 100755 index bc669d5d15..0000000000 --- a/common/source/test/TESTS.pl +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require 5.8.0; - -use strict; -use warnings; -use Getopt::Long; -use vars qw(@tests); - -my $dir = undef; - -sub test_exec -{ - my ($harness, $test_file) = @_; - if ($test_file =~ /.pl$/) { - if ($dir) { - return "$dir/$test_file"; - } else { - return undef; - } - } else { - my @cmd; - my $valgrind=""; - if (exists $ENV{VALGRIND}) - { - push(@cmd, 'valgrind'); - push(@cmd, "--log-file=VALGRIND-$test_file.log"); - if (exists $ENV{VALGRIND_OPTIONS}) - { - for my $opt (split(/\s+/, $ENV{VALGRIND_OPTIONS})) { - if ($opt ne '') { - push(@cmd, $opt); - } - } - } - } - push(@cmd, "$test_file"); - return \@cmd; - } -} - -my $harness_class = "TAP::Harness"; - -if (!GetOptions("harness=s" => \$harness_class, - "dir=s" => \$dir)) -{ - print STDERR "Usage: $0 [-harness CLASSNAME] [-dir TESTDIR]\n"; - exit(1); -} - -eval "use $harness_class"; - -my $harness_args = {'exec' => \&test_exec, 'merge' => 1}; -$harness_args->{'lib'} = [ $dir ] if ($dir); -my $harness = $harness_class->new($harness_args); - -$ENV{PATH} = ".:" . $ENV{PATH}; -$ENV{PATH} = "${dir}:" . $ENV{PATH} if ($dir); - -@tests = qw( - fifo_test - globus_args_scan_test - globus_error_construct_string_test - globus_libc_setenv_test - globus_url_test - hash_test - list_test - memory_test - module_test - off_t_test - poll_test - strptime_test - thread_test - timedwait_test - uuid_test -); - -$harness->runtests(@tests); diff --git a/gram/jobmanager/scheduler_event_generator/source/configure.ac b/gram/jobmanager/scheduler_event_generator/source/configure.ac index f59e1e46b1..5186736698 100644 --- a/gram/jobmanager/scheduler_event_generator/source/configure.ac +++ b/gram/jobmanager/scheduler_event_generator/source/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_scheduler_event_generator],[6.2],[https://github.com/gridcf/gct/issues]) +AC_INIT([globus_scheduler_event_generator],[6.3],[https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff --git a/gram/jobmanager/scheduler_event_generator/source/test/Makefile.am b/gram/jobmanager/scheduler_event_generator/source/test/Makefile.am index c538eaa3b1..30219a2949 100644 --- a/gram/jobmanager/scheduler_event_generator/source/test/Makefile.am +++ b/gram/jobmanager/scheduler_event_generator/source/test/Makefile.am @@ -6,7 +6,6 @@ check_PROGRAMS = \ seg-timestamp-test \ seg-api-test check_SCRIPTS = \ - TESTS.pl \ seg-api-test.pl check_DATA = \ seg_api_test_data.txt \ diff --git a/gram/jobmanager/scheduler_event_generator/source/test/TESTS.pl b/gram/jobmanager/scheduler_event_generator/source/test/TESTS.pl deleted file mode 100755 index 008d414811..0000000000 --- a/gram/jobmanager/scheduler_event_generator/source/test/TESTS.pl +++ /dev/null @@ -1,60 +0,0 @@ -#! /usr/bin/perl - -require 5.8.0; - -use strict; -use File::Basename; -use Getopt::Long; -use Test::Harness; -use lib dirname($0); - -use vars qw(@tests); -sub test_exec -{ - my ($harness, $test_file) = @_; - if ($test_file =~ /.pl$/) { - if (-f dirname($0)."/".$test_file) { - return dirname($0)."/".$test_file; - } else { - return undef; - } - } else { - my @cmd; - my $valgrind=""; - if (exists $ENV{VALGRIND}) - { - push(@cmd, 'valgrind'); - push(@cmd, "--log-file=VALGRIND-$test_file.log"); - if (exists $ENV{VALGRIND_OPTIONS}) - { - for my $opt (split(/\s+/, $ENV{VALGRIND_OPTIONS})) { - if ($opt ne '') { - push(@cmd, $opt); - } - } - } - } - push(@cmd, "./$test_file"); - return \@cmd; - } -} -my $harness_class = "TAP::Harness"; - -if (!GetOptions("harness=s" => \$harness_class)) -{ - print STDERR "Usage: $0 [-harness CLASSNAME]\n"; - exit(1); -} - -eval "use $harness_class"; - -my $harness_args = {'exec' => \&test_exec, 'merge' => 1}; -my $harness = $harness_class->new($harness_args); - -my $test_result = 1; -$|=1; - -@tests = qw( - seg-api-test.pl seg-module-load-test seg-timestamp-test -); -$harness->runtests(@tests) diff --git a/gram/jobmanager/source/test/client/register-refresh-credentials-test.pl b/gram/jobmanager/source/test/client/register-refresh-credentials-test.pl deleted file mode 100755 index 1ee44e23a7..0000000000 --- a/gram/jobmanager/source/test/client/register-refresh-credentials-test.pl +++ /dev/null @@ -1,72 +0,0 @@ -#! /usr/bin/env perl -# -# Copyright 1999-2010 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -use strict; -use POSIX; -use Test; - -my $test_exec = './register-refresh-credentials-test'; - -if ($ENV{CONTACT_STRING} eq "") -{ - die "CONTACT_STRING not set"; -} - -my @tests; -my @todo; -my $valgrind = ""; - -if (exists $ENV{VALGRIND}) -{ - $valgrind = "valgrind --log-file=VALGRIND-register_register_refresh_credentials_test.log"; - if (exists $ENV{VALGRIND_OPTIONS}) - { - $valgrind .= ' ' . $ENV{VALGRIND_OPTIONS}; - } -} - -sub refresh_creds_test -{ - my ($errors,$rc) = ("",0); - my ($output); - my ($contact) = shift; - - system("$valgrind $test_exec '$contact' >/dev/null"); - $rc = $?>> 8; - if($rc != 0) - { - $errors .= "Test exited with $rc. "; - } - - if($errors eq "") - { - ok('success', 'success'); - } - else - { - ok($errors, 'success'); - } -} -push(@tests, "refresh_creds_test('$ENV{CONTACT_STRING}');"); - -# Now that the tests are defined, set up the Test to deal with them. -plan tests => scalar(@tests), todo => \@todo; - -foreach (@tests) -{ - eval "&$_"; -} diff --git a/gram/jobmanager/source/test/client/register-status-test.pl b/gram/jobmanager/source/test/client/register-status-test.pl deleted file mode 100755 index d7c8b1bc63..0000000000 --- a/gram/jobmanager/source/test/client/register-status-test.pl +++ /dev/null @@ -1,74 +0,0 @@ -#! /usr/bin/env perl -# -# Copyright 1999-2010 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# Ping a valid and invalid gatekeeper contact. - -use strict; -use POSIX; -use Test; - -my $test_exec = './register-status-test'; - -if ($ENV{CONTACT_STRING} eq "") -{ - die "CONTACT_STRING not set"; -} - -my @tests; -my @todo; -my $valgrind = ""; - -if (exists $ENV{VALGRIND}) -{ - $valgrind = "valgrind --log-file=VALGRIND-register_status_test.log"; - if (exists $ENV{VALGRIND_OPTIONS}) - { - $valgrind .= ' ' . $ENV{VALGRIND_OPTIONS}; - } -} - -sub status_test -{ - my ($errors,$rc) = ("",0); - my ($output); - my ($contact, $result) = @_; - - system("$valgrind $test_exec '$contact' >/dev/null"); - $rc = $?>> 8; - if($rc != $result) - { - $errors .= "Test exited with $rc. "; - } - - if($errors eq "") - { - ok('success', 'success'); - } - else - { - ok($errors, 'success'); - } -} -push(@tests, "status_test('$ENV{CONTACT_STRING}', 0);"); - -# Now that the tests are defined, set up the Test to deal with them. -plan tests => scalar(@tests), todo => \@todo; - -foreach (@tests) -{ - eval "&$_"; -} diff --git a/gram/protocol/source/test/.gitignore b/gram/protocol/source/test/.gitignore index 0dc77d952e..b5af00bd7f 100644 --- a/gram/protocol/source/test/.gitignore +++ b/gram/protocol/source/test/.gitignore @@ -3,7 +3,6 @@ Makefile globus_gram_protocol_test-[0-9]* *-test *-test.pl -globus-gram-protocol-run-tests.pl *.lo *.la .libs diff --git a/gridftp/client/source/configure.ac b/gridftp/client/source/configure.ac index ed42cd0891..95d9f55fca 100644 --- a/gridftp/client/source/configure.ac +++ b/gridftp/client/source/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_ftp_client],[9.3],[https://github.com/gridcf/gct/issues]) +AC_INIT([globus_ftp_client],[9.4],[https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff --git a/gridftp/client/source/test/FtpTestLib.pm b/gridftp/client/source/test/FtpTestLib.pm index 941083e11c..7738cedef4 100644 --- a/gridftp/client/source/test/FtpTestLib.pm +++ b/gridftp/client/source/test/FtpTestLib.pm @@ -1,5 +1,3 @@ -#!/usr/bin/env perl - # # Copyright 1999-2006 University of Chicago # diff --git a/gridftp/client/source/test/Makefile.am b/gridftp/client/source/test/Makefile.am index fdf0b13a79..d0abfed9d6 100644 --- a/gridftp/client/source/test/Makefile.am +++ b/gridftp/client/source/test/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_SCRIPTS = run-tests.pl many-server.pl run-backend-tests.pl test-wrapper +EXTRA_SCRIPTS = test-wrapper check_SCRIPTS_run = \ dir-test.pl \ diff --git a/gridftp/client/source/test/NOTES.win32 b/gridftp/client/source/test/NOTES.win32 deleted file mode 100644 index 9a24ee5851..0000000000 --- a/gridftp/client/source/test/NOTES.win32 +++ /dev/null @@ -1,33 +0,0 @@ - -FTP test suite notes: - --running the test suite requires many common unix utilites to be installed. you'll need at least: cat, cmp, diff, scp, perl, and sed - --run_command() in FtpTestLib.pm currently has a hack in place to deal with windows build installing exes with incorrect names (they have underscores instead of hyphens) - --copy *.pl *.pm testcred.pem dc31a685.0 dc31a685.signing_policy - from the gridftp\client\test dir to folder with all test exes - --currently test requires external server (since gridftp isn't ported to windows yet) - once that server is setup, set the following env variables: -set GLOBUS_LOCATION= -set FTP_TEST_DEST_FILE= -set FTP_TEST_DEST_HOST=192.168.100.11:5000 -set FTP_TEST_SOURCE_HOST=192.168.100.11:5000 -set FTP_TEST_DEST_USER=link -set FTP_TEST_SOURCE_USER=link - -- user specified in FTP_TEST_DEST_USER/FTP_TEST_SOURCE_USER is used for scp-ing files to and from remote server. Be sure to connect to server with ssh first to force host entry into known_hosts file. - --note: running test suite with remote server disables a couple tests.. you will see 'FAILED before any test output arrived' - --I've only tested without GSI using an anonymous/plain text gridftp server -set FTP_TEST_NO_GSI=1 - --The test suite will not work with NAT in between it and the remote server without a disgusting hack to globus_ftp_client_state.c (this is also the case on unix side) - --The windows registry needs its tcpip settings changed from their defaults. In particular, the MaxUserPort setting needs to be increased for all tests to succeed (the test suite makes many connections which exhausts windows' ephemeral port range). I set it to the max possible, 65535. - --run the test suite with globus-ftp-client-run-tests.pl - --the test suite reports that the last test in globus-ftp-client-caching-get-test.pl and globus-ftp-client-get-test.pl fails. Logging shows they are in fact NOT failing. I am not sure why the test harness is lying. diff --git a/gridftp/client/source/test/TESTS-junit.pl b/gridftp/client/source/test/TESTS-junit.pl deleted file mode 100755 index 88965408ad..0000000000 --- a/gridftp/client/source/test/TESTS-junit.pl +++ /dev/null @@ -1,45 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -my $rc; -my $count = 1; - -if(!defined($ENV{FTP_TEST_NO_GSI})) -{ - $count = 2; -} - -for(my $i = 0; $i < $count; $i++) -{ - $rc = system('./run-tests.pl -runserver -junit'); - if($rc != 0) - { - exit $rc; - } - - if(defined($ENV{GLOBUS_TEST_EXTENDED})) - { - $rc = system('./many-server.pl'); - if($rc != 0) - { - exit $rc; - } - } - $ENV{FTP_TEST_NO_GSI} = 1; -} -exit $rc; diff --git a/gridftp/client/source/test/TESTS.pl b/gridftp/client/source/test/TESTS.pl deleted file mode 100755 index ec5bee0945..0000000000 --- a/gridftp/client/source/test/TESTS.pl +++ /dev/null @@ -1,45 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -my $rc; -my $count = 1; - -if(!defined($ENV{FTP_TEST_NO_GSI})) -{ - $count = 2; -} - -for(my $i = 0; $i < $count; $i++) -{ - $rc = system('./run-tests.pl -runserver'); - if($rc != 0) - { - exit $rc; - } - - if(defined($ENV{GLOBUS_TEST_EXTENDED})) - { - $rc = system('./many-server.pl'); - if($rc != 0) - { - exit $rc; - } - } - $ENV{FTP_TEST_NO_GSI} = 1; -} -exit $rc; diff --git a/gridftp/client/source/test/dc31a685.0 b/gridftp/client/source/test/dc31a685.0 deleted file mode 100644 index 86ccefd0be..0000000000 --- a/gridftp/client/source/test/dc31a685.0 +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfTCCAeagAwIBAgIBADANBgkqhkiG9w0BAQQFADBhMQ0wCwYDVQQKEwRHcmlk -MRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVDQS1nbG9idXMu -b3JnMR0wGwYDVQQDExRHbG9idXMgVGVzdCBTdWl0ZSBDQTAeFw0wMzA2MDYwMTAw -MTlaFw0xMzA2MDMwMTAwMTlaMGExDTALBgNVBAoTBEdyaWQxEzARBgNVBAsTCkds -b2J1c1Rlc3QxHDAaBgNVBAsTE3NpbXBsZUNBLWdsb2J1cy5vcmcxHTAbBgNVBAMT -FEdsb2J1cyBUZXN0IFN1aXRlIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB -gQC6/PrZ0hpXU5kGv+g9poGTfiIJT5RPB2w0FTUej0O62CDuK8UMm/3I0VtCLrjq -gTm8LyqqR0O1fMJqbGczo59ROdSEetYRkqkOWyZkLRfG34ahO6p2H4MPwfoZxfuO -I/y7bg9TLAEQqMMI+/wWewwXKffOIHVs39EvywG9AM4flwIDAQABo0UwQzAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQkM1gkOnip6wrknN0pwuzT/7okuzARBglg -hkgBhvhCAQEEBAMCAAcwDQYJKoZIhvcNAQEEBQADgYEAY7HTu0sVdwWH4fLcf7x+ -XoqzVxCXZ97rt9TZXBEQ3A9DnmtOrg/dlHPbUZqyuy5M+d3a+d/Mk7PCdlok8nA6 -CJ25Q0HmL3WMQ/saTx49h04QnX1mpa1z2Q/qp8/wWVkUd9hXyXEXVqmWA53bRcP4 -ueAa7Dnn5BAzDyb7KZXqK/8= ------END CERTIFICATE----- diff --git a/gridftp/client/source/test/dc31a685.signing_policy b/gridftp/client/source/test/dc31a685.signing_policy deleted file mode 100644 index d940479d28..0000000000 --- a/gridftp/client/source/test/dc31a685.signing_policy +++ /dev/null @@ -1,33 +0,0 @@ -# ca-signing-policy.conf, see ca-signing-policy.doc for more information -# -# This is the configuration file describing the policy for what CAs are -# allowed to sign whoses certificates. -# -# This file is parsed from start to finish with a given CA and subject -# name. -# subject names may include the following wildcard characters: -# * Matches any number of characters. -# ? Matches any single character. -# -# CA names must be specified (no wildcards). Names containing whitespaces -# must be included in single quotes, e.g. 'Certification Authority'. -# Names must not contain new line symbols. -# The value of condition attribute is represented as a set of regular -# expressions. Each regular expression must be included in double quotes. -# -# This policy file dictates the following policy: -# -The Globus CA can sign Globus certificates -# -# Format: -#------------------------------------------------------------------------ -# token type | def.authority | value -#--------------|---------------|----------------------------------------- -# EACL entry #1| - - access_id_CA X509 '/O=Grid/OU=GlobusTest/OU=simpleCA-globus.org/CN=Globus Test Suite CA' - - pos_rights globus CA:sign - - cond_subjects globus '"/O=Grid/OU=GlobusTest/OU=simpleCA-globus.org/*"' - -# end of EACL diff --git a/gridftp/client/source/test/guctest.sh b/gridftp/client/source/test/guctest.sh deleted file mode 100755 index fd1058ee03..0000000000 --- a/gridftp/client/source/test/guctest.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -runs=1 -srcpath="/tmp/src/" -dstpath="/tmp/dst/" -file="file://" -ftp="gsiftp://localhost:5000" -ftp2="gsiftp://localhost:5000" -out="~/errors/" - -guc="globus-url-copy" -priv="-dcpriv" -safe="-dcsafe" -modee="-fast" -dbg="-dbg" -nodcau="-nodcau" -off="-off 10" -len="-len 439" -notpt="-notpt" -cont="-c" - -testset=0 -function runtest() { - let testset=testset+1; - echo "set $testset: running $1 to $2 test with options: ${!3} ${!4} ${!5} ${!6} ${!7} ${!8} ${!9} ${!10} ${!11}" - - i=0 - failed=0 - while [ $i -lt $runs ]; do - let i=i+1; - echo "**********************************************" > ${out}temp - echo "**********************************************" >> ${out}temp - echo "set $testset: running $1 to $2 test with options: ${!3} ${!4} ${!5} ${!6} ${!7} ${!8} ${!9} ${!10} ${!11}" >> ${out}temp - echo $guc -dbg ${!3} ${!4} ${!5} ${!6} ${!7} ${!8} ${!9} ${!10} ${!11} ${!1}$srcpath ${!2}$dstpath >> ${out}temp - $guc ${!3} ${!4} ${!5} ${!6} ${!7} ${!8} ${!9} ${!10} ${!11} ${!1}$srcpath ${!2}$dstpath - if [ $? -ne 0 ]; then - echo "Test $1 to $2 with options: ${!3} ${!4} ${!5} ${!6} ${!7} ${!8} ${!9} ${!10} ${!11} FAILED" >> ${out}temp - cat ${out}temp >> ${out}test${testset}-$$ - let failed=failed+1; - fi - done - if [ $failed -gt 0 ]; then - echo "set: $testset: $failed/$runs tests FAILED, log at ${out}test${testset}-$$" - else - echo "set $testset: all $runs tests completed successfully" - fi -} - -for src in ftp file; do - for dst in ftp2 file; do - for opt1 in "" modee; do - for opt2 in "" safe priv; do - for opt3 in "" nodcau; do - for opt4 in "" len; do - for opt5 in "" off; do - for opt6 in "" cont; do - for opt7 in "" notpt; do - runtest $src $dst $opt1 $opt2 $opt3 $opt4 $opt5 $opt6 $opt7 - done - done - done -done -done -done -done -done -done diff --git a/gridftp/client/source/test/many-server.pl b/gridftp/client/source/test/many-server.pl deleted file mode 100755 index 07b5fa181a..0000000000 --- a/gridftp/client/source/test/many-server.pl +++ /dev/null @@ -1,42 +0,0 @@ -# !/usr/bin/perl -# -# Copyright 1999-2010 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use File::Basename; -use lib dirname($0); - -use strict; -require 5.005; - -require "gfs_common.pl"; - -my $subject = gfs_setup_security_env(); -my $test_ndx = 0; -my $pid; -my $cs; -my $cnt=0; -($pid,$cs,$test_ndx) = gfs_next_test($test_ndx); -while($test_ndx >= 0) -{ - my $rc = system('./globus-ftp-client-run-tests.pl'); - if($rc != 0) - { - exit $rc; - } - ($pid,$cs,$test_ndx) = gfs_next_test($test_ndx); -} - -exit 0; diff --git a/gridftp/client/source/test/run-backend-tests.pl b/gridftp/client/source/test/run-backend-tests.pl deleted file mode 100755 index 5433870432..0000000000 --- a/gridftp/client/source/test/run-backend-tests.pl +++ /dev/null @@ -1,225 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -use File::Basename; -use lib dirname($0); -use FtpTestLib; - -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -@tests = qw( - dir-test.pl - caching-get-test.pl - caching-transfer-test.pl - create-destroy-test.pl - exist-test.pl - extended-get-test.pl - extended-put-test.pl - extended-transfer-test.pl - get-test.pl - lingering-get-test.pl - multiple-block-get-test.pl - partial-get-test.pl - partial-put-test.pl - partial-transfer-test.pl - plugin-test.pl - put-test.pl - size-test.pl - transfer-test.pl - user-auth-test.pl - ); - -if(defined($ENV{FTP_TEST_RANDOMIZE})) -{ - shuffle(\@tests); -} - -my $runserver; -my $nogsi; -my $server_pid; -my $backend_pid; - -GetOptions( 'runserver' => \$runserver, - 'nogsi' => \$nogsi); - -if(defined($nogsi) or defined($ENV{FTP_TEST_NO_GSI})) -{ - $nogsi = 1; - $ENV{FTP_TEST_NO_GSI} = 1; - print "Not using GSI security.\n"; -} -if(defined($runserver)) -{ - ($server_pid,$backend_pid) = setup_server(1); -} - -if(run_command("grid-proxy-info -exists -hours 2", 0) && !defined($nogsi)) -{ - print "Security proxy required to run the tests.\n"; - exit 1; -} - -print "Running sanity check\n"; -my ($proto) = setup_proto(); -my ($source_host, $source_file, $local_copy1) = setup_remote_source(); -my ($local_copy2) = setup_local_source(); -my ($dest_host, $dest_file) = setup_remote_dest(); - -if(run_command("./globus-ftp-client-get-test -s $proto$source_host$source_file", 0)) -{ - print "Sanity check of source ($proto$source_host$source_file) failed.\n"; - if(defined($server_pid)) - { - kill(9,$server_pid); - } - - exit 1; -} -if(run_command("./globus-ftp-client-put-test -d $proto$dest_host$dest_file < $local_copy2", 0)) -{ - print "Sanity check of local source ($local_copy2) to dest ($proto$dest_host$dest_file) failed.\n"; - clean_remote_file($dest_host, $dest_file); - - if(defined($server_pid)) - { - kill(9,$server_pid); - } - - exit 1; -} -clean_remote_file($dest_host, $dest_file); -print "Server appears sane, running tests\n"; - -push(@INC, $ENV{GLOBUS_LOCATION} . "/lib/perl"); - -eval runtests(@tests); - -$@ && print "$@"; - -if($server_pid) -{ - kill(2,$server_pid); - sleep(2); - kill(2,$server_pid); - $server_pid=0; -} -if($backend_pid) -{ - kill(2,$backend_pid); - sleep(2); - kill(2,$backend_pid); - $backend_pid=0; -} - -exit 0; - -sub setup_server() -{ - my $backend_port; - my $backend_args; - my $run_backend=shift; - my $server_pid; - my $backend_pid; - my $server_prog = "globus-gridftp-server"; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - if(defined($nogsi)) - { - $server_nosec = "-aa"; - } - - if(!defined($nogsi)) - { - chomp($subject = `openssl x509 -in testcred.cert -subject -noout -nameopt rfc2253,-dn_rev`); - $subject =~ s/^subject= */\//; - $subject =~ s/,/\//g; - - $ENV{GRIDMAP} = cwd() . "/gridmap"; - if ( -f $ENV{GRIDMAP}) - { - system('mv $GRIDMAP $GRIDMAP.old'); - } - if( 0 != system("grid-mapfile-add-entry -dn \"$subject\" -ln `id -un` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - } - - my $server_args = "-no-fork -no-chdir -d 0 -p $server_port $server_nosec"; - if($run_backend == 1) - { - $backend_args = "-no-fork -no-chdir -dn -d 0 $server_nosec"; - $backend_pid = open(BACKEND, "$server_prog $backend_args |"); - if($backend_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - - select((select(BACKEND), $| = 1)[0]); - $backend_port = ; - $backend_port =~ s/Server listening at .*?:(\d+)/\1/; - chomp($backend_port); - if($backend_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - $server_args = "$server_args -r localhost:$backend_port"; - } - - print "$server_args\n"; - $server_pid = open(SERVER, "$server_prog $server_args |"); - if($server_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - - select((select(SERVER), $| = 1)[0]); - $server_port = ; - $server_port =~ s/Server listening at .*?:(\d+)/\1/; - chomp($server_port); - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - - print "Started server at port $server_port\n"; - - # sleep a second, some hosts are slow.... - - sleep 5; - - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - $ENV{FTP_TEST_SOURCE_HOST} = "$server_host:$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_host:$server_port"; - - return $server_pid,$backend_pid; -} diff --git a/gridftp/client/source/test/run-tests.pl b/gridftp/client/source/test/run-tests.pl deleted file mode 100755 index 9977fecf64..0000000000 --- a/gridftp/client/source/test/run-tests.pl +++ /dev/null @@ -1,223 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use Cwd; -use File::Basename; -use Getopt::Long; -use lib dirname($0); -use FtpTestLib; - -require 5.8.0; -use vars qw(@tests); - -@tests = qw( - caching-get-test.pl - caching-transfer-test.pl - create-destroy-test.pl - dir-test.pl - exist-test.pl - extended-get-test.pl - extended-put-test.pl - extended-transfer-test.pl - get-test.pl - lingering-get-test.pl - multiple-block-get-test.pl - partial-get-test.pl - partial-put-test.pl - partial-transfer-test.pl - plugin-test.pl - put-test.pl - size-test.pl - transfer-test.pl - user-auth-test.pl - ); - -if(defined($ENV{FTP_TEST_RANDOMIZE})) -{ - shuffle(\@tests); -} - - -my $runserver=1; -my $nogsi; -my $server_pid; -my $junit; -my $harness; - -GetOptions( 'runserver!' => \$runserver, - 'junit' => \$junit, - 'nogsi' => \$nogsi); - -if(defined($nogsi) or defined($ENV{FTP_TEST_NO_GSI})) -{ - $nogsi = 1; - $ENV{FTP_TEST_NO_GSI} = 1; - print "Not using GSI security.\n"; -} - -if ($junit) -{ - require 'TAP/Harness/JUnit.pm'; - TAP::Harness::JUnit->import(':DEFAULT'); - my $xmlfile; - - if ($nogsi) - { - $xmlfile = 'globus-ftp-client-test-nogsi.xml'; - } - else - { - $xmlfile = 'globus-ftp-client-test-gsi.xml'; - } - - $harness = TAP::Harness::JUnit->new({ - merge=>1, - xmlfile=> $xmlfile}); -} -else -{ - require 'Test/Harness.pm'; - Test::Harness->import(':DEFAULT'); -} -if(defined($runserver) && !defined($ENV{FTP_TEST_SSH_FTP})) -{ - $server_pid = setup_server(); -} -if(defined($ENV{FTP_TEST_SSH_FTP})) -{ - $nogsi = 1; -} - -print "Running sanity check\n"; -my ($proto) = setup_proto(); -my ($source_host, $source_file, $local_copy1) = setup_remote_source(); -my ($local_copy2) = setup_local_source(); -my ($dest_host, $dest_file) = setup_remote_dest(); - -if(run_command("./get-test -p -s $proto$source_host$source_file", 0, "sanitycheck.log", "sanitycheck.log")) -{ - print "Sanity check of source ($proto$source_host$source_file) failed.\n"; - system("cat sanitycheck.log"); - if(defined($server_pid)) - { - kill(9,$server_pid); - } - - exit 1; -} -if(run_command("./put-test -d $proto$dest_host$dest_file < $local_copy2", 0)) -{ - print "Sanity check of local source ($local_copy2) to dest ($proto$dest_host$dest_file) failed.\n"; - clean_remote_file($dest_host, $dest_file); - - if(defined($server_pid)) - { - kill(9,$server_pid); - } - - exit 1; -} -clean_remote_file($dest_host, $dest_file); -print "Server appears sane, running tests\n"; - -push(@INC, $ENV{GLOBUS_LOCATION} . "/lib/perl"); - -if ($junit) -{ - eval $harness->runtests(@tests); -} -else -{ - runtests(@tests); -} - -$@ && print "$@"; - -if($server_pid) -{ - kill(9,$server_pid); - $server_pid=0; -} - -exit 0; - -sub setup_server() -{ - my $server_pid; - my $server_prog = "globus-gridftp-server"; - my $server_host = "localhost"; - my $server_port = 0; - my $server_nosec = ""; - my $subject; - if(defined($nogsi)) - { - $server_nosec = "-aa"; - } - - my $server_args = "-no-fork -no-chdir -d 0 -p $server_port $server_nosec"; - - if(!defined($nogsi)) - { - chomp($subject = `openssl x509 -in testcred.cert -subject -noout -nameopt rfc2253,-dn_rev`); - $subject =~ s/^subject= */\//; - $subject =~ s/,/\//g; - - $ENV{GRIDMAP} = cwd() . "/gridmap"; - if ( -f $ENV{GRIDMAP}) - { - rename($ENV{GRIDMAP}, "$ENV{GRIDMAP}.old"); - } - if( 0 != system("grid-mapfile-add-entry -dn \"$subject\" -ln `id -un` -f $ENV{GRIDMAP} >/dev/null 2>&1") / 256) - { - print "Unable to create gridmap file\n"; - exit 1; - } - } - - $server_pid = open(SERVER, "$server_prog $server_args |"); - - if($server_pid == -1) - { - print "Unable to start server\n"; - exit 1; - } - - select((select(SERVER), $| = 1)[0]); - $server_port = ; - $server_port =~ s/Server listening at .*?:(\d+)/\1/; - chomp($server_port); - - if($server_port !~ /\d+/) - { - print "Unable to start server\n"; - exit 1; - } - - print "Started server at port $server_port\n"; - - # sleep a second, some hosts are slow.... - - sleep 5; - - $ENV{GLOBUS_FTP_CLIENT_TEST_SUBJECT} = $subject; - $ENV{FTP_TEST_SOURCE_HOST} = "$server_host:$server_port"; - $ENV{FTP_TEST_DEST_HOST} = "$server_host:$server_port"; - - return $server_pid; -} diff --git a/gridftp/client/source/test/testcred.pem b/gridftp/client/source/test/testcred.pem deleted file mode 100644 index ec0090d34c..0000000000 --- a/gridftp/client/source/test/testcred.pem +++ /dev/null @@ -1,39 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUzCCAbygAwIBAgIEJCD+RTANBgkqhkiG9w0BAQQFADBzMQ0wCwYDVQQKEwRH -cmlkMRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVDQS1nbG9i -dXMub3JnMRQwEgYDVQQLEwttY3MuYW5sLmdvdjEZMBcGA1UEAxMQVGVzdCBDZXJ0 -aWZpY2F0ZTAeFw0wMzA2MDYyMjE2NDNaFw0wODA2MjkwMTA4NTZaMIGHMQ0wCwYD -VQQKEwRHcmlkMRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVD -QS1nbG9idXMub3JnMRQwEgYDVQQLEwttY3MuYW5sLmdvdjEZMBcGA1UEAxMQVGVz -dCBDZXJ0aWZpY2F0ZTESMBAGA1UEAxMJNjA2MTQyMDIxMFwwDQYJKoZIhvcNAQEB -BQADSwAwSAJBALsu0b7PFQqrOTy+THd4AEbFvbgLZsI3q+myUAU4bL2XYYwpbFR9 -OPRAWGCgFosBz/nEVkFXKV0VDurKEW4/ZssCAwEAAaMjMCEwHwYKKwYBBAGbUAGB -XgEB/wQOMAwwCgYIKwYBBQUHFQEwDQYJKoZIhvcNAQEEBQADgYEAH7Guq7hop+Td -gqknZv7XwqKfzpeTXl5sAJXwzUSMoxOsOFuE3MxdaKM2lXBStX8FHGrvevXbVSvL -z+KUpPBRAvSfoZlMLJLnqCxW1Y2GeExg66lzH4AQF0hCzW/r9SjblCvHZDzoy/Kd -yLnUWbDhwk2YfyIcBKtxZ8kHwVUbUjg= ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIIBOQIBAAJBALsu0b7PFQqrOTy+THd4AEbFvbgLZsI3q+myUAU4bL2XYYwpbFR9 -OPRAWGCgFosBz/nEVkFXKV0VDurKEW4/ZssCAwEAAQJAA/G/n7qzYc8r3JjR+a6A -qv0du1QaLTuJFtqYDxQaToBp2FDUFTHlAGrKKB4eBAsSVsYBy0/uetAxPKJdK7HV -OQIhAPTBB/vpG/qtbsxyFIzHybo2GGv2TrjGm93hgIivwq8fAiEAw8iYj19VtrYU -uwihwhYQh5yt2V1vi7MU5UA7S+5QDtUCIFxrg4NJK+qFkOAcd8wNKQxqnuAtmt5F -CNhI7YsvqzkLAiA6o6E2B/rXL7AD2PEB/bPTulTDrt2S/P88LsHT2zv1RQIgayqn -oTDyUE/r4w7mEtYSf83SbMhbfdqduoo8ao7VNvI= ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIICXzCCAcigAwIBAgIBAjANBgkqhkiG9w0BAQQFADBhMQ0wCwYDVQQKEwRHcmlk -MRMwEQYDVQQLEwpHbG9idXNUZXN0MRwwGgYDVQQLExNzaW1wbGVDQS1nbG9idXMu -b3JnMR0wGwYDVQQDExRHbG9idXMgVGVzdCBTdWl0ZSBDQTAeFw0wMzA2MDYwMTA4 -NTZaFw0wODA2MjkwMTA4NTZaMHMxDTALBgNVBAoTBEdyaWQxEzARBgNVBAsTCkds -b2J1c1Rlc3QxHDAaBgNVBAsTE3NpbXBsZUNBLWdsb2J1cy5vcmcxFDASBgNVBAsT -C21jcy5hbmwuZ292MRkwFwYDVQQDExBUZXN0IENlcnRpZmljYXRlMIGfMA0GCSqG -SIb3DQEBAQUAA4GNADCBiQKBgQDXxrOVnZGWf6g8G9Qou7B01KLOf10HrcmxbBxU -/gtHMNSB7pQS2BYO4ZuyGTzYQH7P1R3cx3D5qnern+gXW0bVL4AdDZyho9KzUTos -uPuk2Y1eAqkaeFGo5ZhgRYnVhGD5bGRGMR+DNYDraC60+8KAnRUR+UyU9L4PkR7g -oAleHQIDAQABoxUwEzARBglghkgBhvhCAQEEBAMCBPAwDQYJKoZIhvcNAQEEBQAD -gYEAsO2WxL9QeNfPFpgKwfZVhWpkhqhXc+Hqf5+X05eLBLv+Nz11i8DKU9FYhqil -5kuB3sUJiDmYzNDN7ok4LrwUgHv+BPAyfid5aFz4POytHrazowVMobmiDB9+vR5k -qjaOhxU7F0ZinXz0luympwCco5a+/b2x1KZhB5lxzB2jF0w= ------END CERTIFICATE----- diff --git a/gsi/gssapi/source/test/gssapi-group-test.pl b/gsi/gssapi/source/test/gssapi-group-test.pl deleted file mode 100755 index fb7f0fd614..0000000000 --- a/gsi/gssapi/source/test/gssapi-group-test.pl +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use POSIX; -use Test; - -my $test_prog = 'gssapi-group-test'; - -my $diff = 'diff'; -my @tests; -my @todo; - -my $valgrind = ""; -if (exists $ENV{VALGRIND}) -{ - $valgrind = "valgrind --log-file=VALGRIND-gssapi_group_test.log"; - if (exists $ENV{VALGRIND_OPTIONS}) - { - $valgrind .= ' ' . $ENV{VALGRIND_OPTIONS}; - } -} -sub basic_func -{ - my ($errors,$rc) = ("",0); - - $rc = system("$valgrind ./$test_prog 1>$test_prog.log.stdout 2>$test_prog.log.stderr") / 256; - - if($rc != 0) - { - $errors .= "Test exited with $rc. "; - } - - if($rc & 128) - { - $errors .= "\n# Core file generated."; - } - - open(EXPECTED, "<$test_prog.stdout") || die "Couldn't open $test_prog.stdout: $!\n"; - open(LOGGED, "<$test_prog.log.stdout") || die "Couldn't open $test_prog.log.stdout: $!\n"; - $rc = 0; - while ( my $line = ) - { - my $logged = ; - $rc++ unless ( $logged =~ /$line/ ); - } - - # $rc = system("$diff $test_prog.log.stdout $test_prog.stdout") / 256; - - if($rc != 0) - { - $errors .= "Test produced unexpected output, see $test_prog.log.stdout"; - } - - - $rc = system("$diff $test_prog.log.stderr $test_prog.stderr") / 256; - - if($rc != 0) - { - $errors .= "Test produced unexpected output, see $test_prog.log.stderr"; - } - - if($errors eq "") - { - ok('success', 'success'); - - if( -e "$test_prog.log.stdout" ) - { - unlink("$test_prog.log.stdout"); - } - - if( -e "$test_prog.log.stderr" ) - { - unlink("$test_prog.log.stderr"); - } - } - else - { - ok($errors, 'success'); - } - -} - -sub sig_handler -{ - if( -e "$test_prog.log.stdout" ) - { - unlink("$test_prog.log.stdout"); - } - - if( -e "$test_prog.log.stderr" ) - { - unlink("$test_prog.log.stderr"); - } -} - -$SIG{'INT'} = 'sig_handler'; -$SIG{'QUIT'} = 'sig_handler'; -$SIG{'KILL'} = 'sig_handler'; - - -push(@tests, "basic_func();"); - -# Now that the tests are defined, set up the Test to deal with them. -plan tests => scalar(@tests), todo => \@todo; - -# And run them all. -foreach (@tests) -{ - eval "&$_"; -} diff --git a/gsi/proxy/proxy_ssl/source/configure.ac b/gsi/proxy/proxy_ssl/source/configure.ac index 46278a4130..7c35f99aa3 100644 --- a/gsi/proxy/proxy_ssl/source/configure.ac +++ b/gsi/proxy/proxy_ssl/source/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_gsi_proxy_ssl], [6.3],[https://github.com/gridcf/gct/issues]) +AC_INIT([globus_gsi_proxy_ssl], [6.4],[https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff --git a/gsi/proxy/proxy_ssl/source/test/Makefile.am b/gsi/proxy/proxy_ssl/source/test/Makefile.am index e204427d1f..0c4182f47a 100644 --- a/gsi/proxy/proxy_ssl/source/test/Makefile.am +++ b/gsi/proxy/proxy_ssl/source/test/Makefile.am @@ -5,21 +5,13 @@ check_DATA = \ test_pci.norm3.stdout \ test_pci.norm4.stdout \ test_pci.norm5.stdout -check_SCRIPTS = TESTS.pl TESTS-junit.pl test_pci.pl +check_SCRIPTS = test_pci.pl AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PACKAGE_DEP_CFLAGS) -I$(top_srcdir)/library -I.. LDADD = ../library/libglobus_proxy_ssl.la $(OPENSSL_LIBS) $(PACKAGE_DEP_LIBS) test_pci_SOURCES = test_proxycertinfo.c -test: - chmod a+x $(check_SCRIPTS) - perl ./TESTS.pl - -junit: - chmod a+x $(check_SCRIPTS) - perl ./TESTS-junit.pl - TESTS = test_pci.pl CLEANFILES = \ @@ -35,5 +27,4 @@ CLEANFILES = \ test_pci.norm5.der -EXTRA_DIST = TESTS.pl TESTS-junit.pl test_pci.pl $(check_DATA) -.PHONY: test junit +EXTRA_DIST = test_pci.pl $(check_DATA) diff --git a/gsi/proxy/proxy_ssl/source/test/TESTS-junit.pl b/gsi/proxy/proxy_ssl/source/test/TESTS-junit.pl deleted file mode 100755 index b1cb53cd47..0000000000 --- a/gsi/proxy/proxy_ssl/source/test/TESTS-junit.pl +++ /dev/null @@ -1,43 +0,0 @@ -#! /usr/bin/perl - -require 5.005; - -use warnings; -use strict; - -use vars qw(@tests); - -my $harness; -BEGIN { - my $xmlfile = 'globus-proxy-ssl-test.xml'; - - eval "use TAP::Harness::JUnit"; - if ($@) - { - eval "use TAP::Harness;"; - - if ($@) - { - die "Unable to find JUnit TAP formatter"; - } - else - { - $harness = TAP::Harness->new( { - formatter_class => 'TAP::Formatter::JUnit', - merge => 1 - } ); - } - open(STDOUT, ">$xmlfile"); - } - else - { - $harness = TAP::Harness::JUnit->new({ - xmlfile => $xmlfile, - merge => 1}); - } - $ENV{PATH} = ".:" . $ENV{PATH}; -} - -@tests = qw(test_pci.pl); - -$harness->runtests(@tests); diff --git a/gsi/proxy/proxy_ssl/source/test/TESTS.pl b/gsi/proxy/proxy_ssl/source/test/TESTS.pl deleted file mode 100644 index e091e4b259..0000000000 --- a/gsi/proxy/proxy_ssl/source/test/TESTS.pl +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/perl - -BEGIN -{ - $ENV{PATH} = dirname($0) . ":.:" . $ENV{PATH}; -} -use warnings; -use strict; -use Test::Harness; - -use vars qw(@tests); - -@tests = qw(test_pci.pl); - -runtests(@tests); diff --git a/io/compat/test/TESTS-junit.pl b/io/compat/test/TESTS-junit.pl deleted file mode 100755 index 5fe53d9608..0000000000 --- a/io/compat/test/TESTS-junit.pl +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require 5.005; - -use warnings; -use strict; -use vars qw(@tests); - -my $harness; -BEGIN { - my $xmlfile = 'globus-io-test.xml'; - - eval "use TAP::Harness::JUnit"; - if ($@) - { - eval "use TAP::Harness;"; - - if ($@) - { - die "Unable to find JUnit TAP formatter"; - } - else - { - $harness = TAP::Harness->new( { - formatter_class => 'TAP::Formatter::JUnit', - merge => 1 - } ); - } - open(STDOUT, ">$xmlfile"); - } - else - { - $harness = TAP::Harness::JUnit->new({ - xmlfile => $xmlfile, - merge => 1}); - } -} - -@tests = qw( globus-io-file-test.pl - globus-io-authorization-test.pl - globus-io-tcp-test.pl - ); -$harness->runtests(@tests); diff --git a/io/compat/test/TESTS.pl b/io/compat/test/TESTS.pl deleted file mode 100755 index 9ef63c3dc1..0000000000 --- a/io/compat/test/TESTS.pl +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require 5.005; - -use warnings; -use strict; -use Test::Harness; -use vars qw(@tests); - -@tests = qw( globus-io-file-test.pl - globus-io-authorization-test.pl - globus-io-tcp-test.pl - ); - -runtests(@tests); - diff --git a/packaging/debian/globus-ftp-client/debian/changelog.in b/packaging/debian/globus-ftp-client/debian/changelog.in index c9a2132c0c..088c211568 100644 --- a/packaging/debian/globus-ftp-client/debian/changelog.in +++ b/packaging/debian/globus-ftp-client/debian/changelog.in @@ -1,3 +1,9 @@ +globus-ftp-client (9.4-1+gct.@distro@) @distro@; urgency=medium + + * Remove some unused test scripts + + -- Mattias Ellert Thu, 12 Mar 2020 07:30:27 +0100 + globus-ftp-client (9.3-1+gct.@distro@) @distro@; urgency=medium * Make makefiles exit sooner on errors diff --git a/packaging/debian/globus-gsi-proxy-ssl/debian/changelog.in b/packaging/debian/globus-gsi-proxy-ssl/debian/changelog.in index ed47de6a78..759629c064 100644 --- a/packaging/debian/globus-gsi-proxy-ssl/debian/changelog.in +++ b/packaging/debian/globus-gsi-proxy-ssl/debian/changelog.in @@ -1,3 +1,9 @@ +globus-gsi-proxy-ssl (6.4-1+gct.@distro@) @distro@; urgency=medium + + * Remove unused TESTS.pl script + + -- Mattias Ellert Tue, 10 Mar 2020 17:08:07 +0100 + globus-gsi-proxy-ssl (6.3-1+gct.@distro@) @distro@; urgency=medium * Make makefiles exit sooner on errors diff --git a/packaging/debian/globus-scheduler-event-generator/debian/changelog.in b/packaging/debian/globus-scheduler-event-generator/debian/changelog.in index a1a58e5380..68afefc207 100644 --- a/packaging/debian/globus-scheduler-event-generator/debian/changelog.in +++ b/packaging/debian/globus-scheduler-event-generator/debian/changelog.in @@ -1,3 +1,9 @@ +globus-scheduler-event-generator (6.3-1+gct.@distro@) @distro@; urgency=medium + + * Remove unused TESTS.pl script + + -- Mattias Ellert Tue, 10 Mar 2020 17:09:02 +0100 + globus-scheduler-event-generator (6.2-1+gct.@distro@) @distro@; urgency=medium * Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-ftp-client.spec b/packaging/fedora/globus-ftp-client.spec index 8414bc2f39..fdc00839ea 100644 --- a/packaging/fedora/globus-ftp-client.spec +++ b/packaging/fedora/globus-ftp-client.spec @@ -3,7 +3,7 @@ Name: globus-ftp-client %global soname 2 %global _name %(echo %{name} | tr - _) -Version: 9.3 +Version: 9.4 Release: 1%{?dist} Summary: Grid Community Toolkit - GridFTP Client Library @@ -153,6 +153,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 9.4-1 +- Remove some unused test scripts + * Tue Mar 10 2020 Mattias Ellert - 9.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-gsi-proxy-ssl.spec b/packaging/fedora/globus-gsi-proxy-ssl.spec index 3518217047..08bfec1adf 100644 --- a/packaging/fedora/globus-gsi-proxy-ssl.spec +++ b/packaging/fedora/globus-gsi-proxy-ssl.spec @@ -3,7 +3,7 @@ Name: globus-gsi-proxy-ssl %global soname 1 %global _name %(echo %{name} | tr - _) -Version: 6.3 +Version: 6.4 Release: 1%{?dist} Summary: Grid Community Toolkit - Globus GSI Proxy SSL Library @@ -138,6 +138,9 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 6.4-1 +- Remove unused TESTS.pl script + * Tue Mar 10 2020 Mattias Ellert - 6.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-scheduler-event-generator.spec b/packaging/fedora/globus-scheduler-event-generator.spec index 34228713f9..f1dc17fc7f 100644 --- a/packaging/fedora/globus-scheduler-event-generator.spec +++ b/packaging/fedora/globus-scheduler-event-generator.spec @@ -3,7 +3,7 @@ Name: globus-scheduler-event-generator %global soname 0 %global _name %(echo %{name} | tr - _) -Version: 6.2 +Version: 6.3 Release: 1%{?dist} Summary: Grid Community Toolkit - Scheduler Event Generator @@ -235,6 +235,9 @@ fi %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 6.3-1 +- Remove unused TESTS.pl script + * Tue Mar 10 2020 Mattias Ellert - 6.2-1 - Make makefiles exit sooner on errors diff --git a/xio/src/test/TESTS-junit.pl b/xio/src/test/TESTS-junit.pl deleted file mode 100755 index d291cc2c58..0000000000 --- a/xio/src/test/TESTS-junit.pl +++ /dev/null @@ -1,92 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -require 5.005; -use vars qw(@tests); -use File::Basename; -use lib dirname($0); - -my $harness; -BEGIN { - my $xmlfile = 'globus-xio-test.xml'; - - eval "use TAP::Harness::JUnit"; - if ($@) - { - eval "use TAP::Harness;"; - - if ($@) - { - die "Unable to find JUnit TAP formatter"; - } - else - { - $harness = TAP::Harness->new( { - formatter_class => 'TAP::Formatter::JUnit', - merge => 1 - } ); - } - open(STDOUT, ">$xmlfile"); - } - else - { - $harness = TAP::Harness::JUnit->new({ - xmlfile => $xmlfile, - merge => 1}); - } - #$Test::Harness::verbose = 1; - $ENV{PATH} = ".:" . $ENV{PATH}; - -} -my $testdir = dirname($0); - -@tests = ( - "$testdir/basic-test.pl", - "$testdir/close-barrier-test.pl", - "$testdir/close-cancel-test.pl", - "$testdir/failure-test.pl", - "$testdir/read-barrier-test.pl", - "$testdir/timeout-test.pl", - "$testdir/cancel-test.pl", - "$testdir/random-test.pl", - "$testdir/server-test.pl", - "$testdir/verify-test.pl", - "$testdir/attr-test.pl", - "$testdir/space-test.pl", - "$testdir/server2-test.pl", - "$testdir/block-barrier-test.pl", - "$testdir/stack-test.pl", - "$testdir/unload-test.pl", - "$testdir/http-header-test.pl", - "$testdir/http-post-test.pl", - "$testdir/http-put-test.pl", - "$testdir/http-get-test.pl" - ); - -my $runserver; -my $server_pid; - -$ENV{'XIO_TEST_OUPUT_DIR'}="test_output/$$"; - -my $test_dir=$ENV{'XIO_TEST_OUPUT_DIR'}; - -system("rm -rf $test_dir"); - -$harness->runtests(@tests); diff --git a/xio/src/test/TESTS.pl b/xio/src/test/TESTS.pl deleted file mode 100755 index f9ef8d976d..0000000000 --- a/xio/src/test/TESTS.pl +++ /dev/null @@ -1,65 +0,0 @@ -#! /usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use File::Basename; -use lib dirname($0); -use TAP::Harness; - -use vars qw(@tests); - -my $args = {'lib' => [ dirname($0) ]}; -my $harness = TAP::Harness->new($args); -my $testdir = dirname($0); -$ENV{PATH} = ".:".dirname($0).":$ENV{PATH}"; -print "ENV{PATH} = $ENV{PATH}\n"; - -@tests = ( - "$testdir/basic-test.pl", - "$testdir/close-barrier-test.pl", - "$testdir/close-cancel-test.pl", - "$testdir/failure-test.pl", - "$testdir/read-barrier-test.pl", - "$testdir/timeout-test.pl", - "$testdir/cancel-test.pl", - "$testdir/random-test.pl", - "$testdir/server-test.pl", - "$testdir/verify-test.pl", - "$testdir/attr-test.pl", - "$testdir/space-test.pl", - "$testdir/server2-test.pl", - "$testdir/block-barrier-test.pl", - "$testdir/stack-test.pl", - "$testdir/unload-test.pl", - "$testdir/http-header-test.pl", - "$testdir/http-post-test.pl", - "$testdir/http-put-test.pl", - "$testdir/http-get-test.pl" - ); - -my $runserver; -my $server_pid; - -$ENV{'XIO_TEST_OUPUT_DIR'}="test_output/$$"; - -my $test_dir=$ENV{'XIO_TEST_OUPUT_DIR'}; - -system("rm -rf $test_dir"); - -$harness->runtests(@tests); diff --git a/xio/src/test/all_in_one.pl b/xio/src/test/all_in_one.pl deleted file mode 100755 index 3c95b9bfe8..0000000000 --- a/xio/src/test/all_in_one.pl +++ /dev/null @@ -1,67 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use POSIX; -use Test::More; -use File::Basename; -use lib dirname($0); - - require "test-common.pl"; - -my $type = 0; -if(@ARGV == 1) -{ - $type = 1; -} - -my @tests; -my @todo; -my $test_exec="./framework_test"; - -my @build_tests = qw( - basic-test.pl - close-barrier-test.pl - failure-test.pl - read-barrier-test.pl - timeout-test.pl - random-test.pl - server-test.pl - verify-test.pl - ); - -my $filename="all_tests.txt"; -unlink($filename); -foreach(@build_tests) -{ - my $cmd = "$_ P >> $filename"; - system($cmd); -} - -push(@tests, "-D $filename"); -push(@tests, "-A -D $filename"); - -my $cnt=0; -plan tests => scalar(@tests), todo => \@todo; -foreach(@tests) -{ - my $test_str="ALL.$cnt"; - &run_test("$test_exec $_", $test_str); - $cnt++; -} diff --git a/xio/src/test/blocking-dd-test.pl b/xio/src/test/blocking-dd-test.pl deleted file mode 100755 index b041590d7f..0000000000 --- a/xio/src/test/blocking-dd-test.pl +++ /dev/null @@ -1,76 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use POSIX; -use Test::More; -use File::Basename; -use lib dirname($0); - - require "test-common.pl"; - -my $type = 0; -if(@ARGV == 1) -{ - $type = 1; -} - -my @tests; -my @todo; -my $test_exec="./framework_test"; -my $inline_finish; -my $test_name="blocking_dd"; - - -#setup different driver combinations -my @drivers; -push(@drivers, ""); -push(@drivers, "-D debug"); -push(@drivers, "-D bounce"); -push(@drivers, "-D debug -D bounce"); -push(@drivers, "-D debug -D bounce -D debug"); - -sub basic_tests -{ - foreach(@drivers) - { - my $d=$_; - push(@tests, "$test_name $d"); - } -} - -&basic_tests(); -if($type == 1) -{ - foreach(@tests) - { - print "$_\n"; - } -} -else -{ - my $cnt=0; - plan tests => scalar(@tests), todo => \@todo; - foreach(@tests) - { - my $test_str="$test_name.$cnt"; - &run_test("$test_exec $_", $test_str); - $cnt++; - } -} diff --git a/xio/src/test/close-barrier2-test.pl b/xio/src/test/close-barrier2-test.pl deleted file mode 100755 index 5e15bd2ae8..0000000000 --- a/xio/src/test/close-barrier2-test.pl +++ /dev/null @@ -1,104 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use POSIX; -use Test::More; -use File::Basename; -use lib dirname($0); - - require "test-common.pl"; - -my $type = 0; -if(@ARGV == 1) -{ - $type = 1; -} - -my @tests; -my @todo; -my $test_exec="./framework_test"; -my $test_name="close2_barrier"; - -my $inline_finish; -my $buffer_size=2048; -my $c; - -# setup different chunk sizes -my @chunk_sizes; -push(@chunk_sizes, "1024"); -push(@chunk_sizes, "1924"); -push(@chunk_sizes, "2048"); - -#setup different driver combinations -my @drivers; -push(@drivers, ""); -push(@drivers, "-D debug"); -push(@drivers, "-D bounce"); -push(@drivers, "-D debug -D bounce"); -push(@drivers, "-D bounce -D debug"); -#push(@drivers, "-D null -D debug"); -push(@drivers, "-D debug -D bounce -D debug"); -#push(@drivers, "-D bounce -D null -D bounce"); - -sub close_barrier2 -{ - my $inline_finish="-i"; - - for(my $i = 0; $i < 2; $i++) - { - foreach(@chunk_sizes) - { - my $c = $_; - foreach(@drivers) - { - push(@tests, "$test_name -w 1 -r 0 -c $c -b $buffer_size $inline_finish $_"); - push(@tests, "$test_name -w 0 -r 1 -c $c -b $buffer_size $inline_finish $_"); - for(my $write_count = 1; $write_count <= 16; $write_count *= 4) - { - for(my $read_count = 1; $read_count <= 16; $read_count *= 4) - { - push(@tests, "$test_name -w $write_count -r $read_count -c $c -b $buffer_size $inline_finish $_"); - } - } - } - } - $inline_finish=""; - } -} - -&close_barrier2(); -if($type == 1) -{ - foreach(@tests) - { - print "$_\n"; - } -} -else -{ - plan tests => scalar(@tests), todo => \@todo; - my $cnt=0; - foreach(@tests) - { - my $test_str="$test_name.$cnt"; - &run_test("$test_exec $_", $test_str); - $cnt++; - } -} diff --git a/xio/src/test/driver-test.pl b/xio/src/test/driver-test.pl deleted file mode 100755 index bc388bbb74..0000000000 --- a/xio/src/test/driver-test.pl +++ /dev/null @@ -1,95 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use POSIX; -use Test::More; -use File::Basename; -use lib dirname($0); - - require "test-common.pl"; - -my $test_driver; -if(@ARGV == 1) -{ - $test_driver = $ARGV[0]; -} -else -{ - die "provide a driver name please"; -} - -my @tests; -my @todo; -my $test_exec="./framework_test"; -my $test_name="framework"; - -my $inline_finish; -my $buffer_size=2048; -my $c; - -# setup different chunk sizes -my @chunk_sizes; -push(@chunk_sizes, "1024"); -push(@chunk_sizes, "1924"); -push(@chunk_sizes, "2048"); - -# setup different driver combinations -my @drivers; -push(@drivers, "-D $test_driver"); -#push(@drivers, "-D debug -D $test_driver"); -#push(@drivers, "-D debug -D $test_driver -D debug"); -#push(@drivers, "-D bounce -D $test_driver"); -#push(@drivers, "-D $test_driver -D bounce"); - -sub build_test_list -{ - my $inline_finish="-i"; - - for(my $i = 0; $i < 2; $i++) - { - foreach(@chunk_sizes) - { - my $c = $_; - - foreach(@drivers) - { - my $d = $_; - for(my $write_count = 1; $write_count <= 16; $write_count *= 4) - { - for(my $read_count = 1; $read_count <= 16; $read_count *= 4) - { - push(@tests, "$test_name -w $write_count -r $read_count -c $c -b $buffer_size $inline_finish $d"); - } - } - } - } - $inline_finish=""; - } -} - -&build_test_list(); -plan tests => scalar(@tests), todo => \@todo; -my $cnt=0; -foreach(@tests) -{ - my $test_str="$test_name.$cnt"; - &run_test("$test_exec $_", $test_str); - $cnt++; -} diff --git a/xio/src/test/run-all-tests.pl b/xio/src/test/run-all-tests.pl deleted file mode 100755 index 1abb593b9e..0000000000 --- a/xio/src/test/run-all-tests.pl +++ /dev/null @@ -1,67 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -unlink("test_results.txt"); - -@tests = qw( - basic-test.pl - close-barrier-test.pl - close-cancel-test.pl - failure-test.pl - read-barrier-test.pl - timeout-test.pl - cancel-test.pl - random-test.pl - server-test.pl - verify-test.pl - attr-test.pl - space-test.pl - server2-test.pl - block-barrier-test.pl - stack-test.pl - unload-test.pl - http-header-test.pl - http-post-test.pl - http-put-test.pl - http-get-test.pl - ); - -my $runserver; -my $server_pid; - -$ENV{'XIO_TEST_OUPUT_DIR'}="test_output/$$"; - -my $test_dir=$ENV{'XIO_TEST_OUPUT_DIR'}; - -system("rm -rf $test_dir"); - -eval runtests(@tests); - -$@ && print "$@"; - -exit 0; diff --git a/xio/src/test/run-http-tests.pl b/xio/src/test/run-http-tests.pl deleted file mode 100755 index aff6526ebb..0000000000 --- a/xio/src/test/run-http-tests.pl +++ /dev/null @@ -1,55 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -unlink("test_results.txt"); - -@tests = qw( - http-header-test.pl - http-post-test.pl - http-put-test.pl - http-get-test.pl - http-pingpong-test.pl - http-timeout-test.pl - http-throughput-test.pl - http-timeout-test.pl - ); - -my $runserver; -my $server_pid; - -$ENV{'XIO_TEST_OUPUT_DIR'}="test_output/$$"; - -my $test_dir=$ENV{'XIO_TEST_OUPUT_DIR'}; - -system("rm -rf $test_dir"); - -eval runtests(@tests); - -$@ && print "$@"; - -exit 0; diff --git a/xio/src/test/run-xio-tests.pl b/xio/src/test/run-xio-tests.pl deleted file mode 100755 index ca0087d5ee..0000000000 --- a/xio/src/test/run-xio-tests.pl +++ /dev/null @@ -1,63 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use Test::Harness; -use Cwd; -use Getopt::Long; -require 5.005; -use vars qw(@tests); - -#$Test::Harness::verbose = 1; - -unlink("test_results.txt"); - -@tests = qw( - basic-test.pl - close-barrier-test.pl - close-cancel-test.pl - failure-test.pl - read-barrier-test.pl - timeout-test.pl - cancel-test.pl - random-test.pl - server-test.pl - verify-test.pl - attr-test.pl - space-test.pl - server2-test.pl - block-barrier-test.pl - stack-test.pl - unload-test.pl - ); - -my $runserver; -my $server_pid; - -$ENV{'XIO_TEST_OUPUT_DIR'}="test_output/$$"; - -my $test_dir=$ENV{'XIO_TEST_OUPUT_DIR'}; - -system("rm -rf $test_dir"); - -eval runtests(@tests); - -$@ && print "$@"; - -exit 0; diff --git a/xio/src/test/threads-test.pl b/xio/src/test/threads-test.pl deleted file mode 100755 index 9a04e55b1b..0000000000 --- a/xio/src/test/threads-test.pl +++ /dev/null @@ -1,98 +0,0 @@ -#! /usr/bin/env perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -use strict; -use POSIX; -use Test::More; -use File::Basename; -use lib dirname($0); - - require "test-common.pl"; - -my $type = 0; -if(@ARGV == 1) -{ - $type = 1; -} - -my @tests; -my @todo; -my $test_exec="./framework_test"; - -my $buffer_size=2048; -my $test_name="framework"; - -#setup different driver combinations -my @drivers; -push(@drivers, ""); -push(@drivers, "-D bounce"); -push(@drivers, "-D bounce -D verify -D bounce"); - -my @thr_cnts; -push(@thr_cnts, "1"); -push(@thr_cnts, "3"); -push(@thr_cnts, "5"); - -sub basic_tests -{ - my $inline_finish="-i"; - my $server_flag="-s"; - my $sd = time % 1000; - - foreach(@drivers) - { - my $d=$_; - foreach(@thr_cnts) - { - $ENV{"GLOBUS_CALLBACK_POLLING_THREADS"} = "$_"; - for(my $j = 0; $j < 10; $j++) - { - for(my $count = 1; $count <= 32; $count *= 2) - { - push(@tests, "$test_name -X $sd -w $count -r $count $d -W 524288 -R 524288 $inline_finish"); - $sd++; - } - if($j == 5) - { - $inline_finish=""; - } - } - } - } -} - -&basic_tests(); -if($type == 1) -{ - foreach(@tests) - { - print "$_\n"; - } -} -else -{ - my $cnt=0; - plan tests => scalar(@tests), todo => \@todo; - foreach(@tests) - { - my $test_str="random.$cnt"; - &run_test("$test_exec $_", $test_str); - $cnt++; - } -} From 6d00d8189d8c79fc5ee491e4fd5e9eea73f871fd Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 12 Mar 2020 06:51:02 +0100 Subject: [PATCH 3/5] Remove unused doxygen filter Originally all components using the doxygen filter used a copy of the filter installed by globus-common. Later the filter script was copied to the source directory of each component that uses it, and the copy in globux-common is no longer used (it is not used by globus-common itself). --- common/source/configure.ac | 2 +- common/source/scripts/Makefile.am | 3 - .../globus-vararg-enums-doxygen-filter.pl | 296 ------------------ .../debian/globus-common/debian/changelog.in | 6 + .../debian/libglobus-common-dev.install | 1 - packaging/fedora/globus-common.spec | 7 +- 6 files changed, 11 insertions(+), 304 deletions(-) delete mode 100755 common/source/scripts/globus-vararg-enums-doxygen-filter.pl diff --git a/common/source/configure.ac b/common/source/configure.ac index 28b401d1c4..e6c3f4cda3 100644 --- a/common/source/configure.ac +++ b/common/source/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([globus_common], [18.7], [https://github.com/gridcf/gct/issues]) +AC_INIT([globus_common], [18.8], [https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff --git a/common/source/scripts/Makefile.am b/common/source/scripts/Makefile.am index 2b49670348..3f665c4e55 100644 --- a/common/source/scripts/Makefile.am +++ b/common/source/scripts/Makefile.am @@ -8,8 +8,6 @@ libexecdata_DATA = \ globus-sh-tools-vars.sh \ globus-script-initializer \ globus-script-initializer.$(host_cpu)-$(host_vendor)-$(host_os) -libexec_SCRIPTS = \ - globus-vararg-enums-doxygen-filter.pl bin_SCRIPTS = \ globus-hostname \ @@ -30,5 +28,4 @@ DISTCLEANFILES = globus-script-initializer.$(host_cpu)-$(host_vendor)-$(host_os) EXTRA_DIST = \ globus-args-parser-header \ - globus-vararg-enums-doxygen-filter.pl \ Config.pm diff --git a/common/source/scripts/globus-vararg-enums-doxygen-filter.pl b/common/source/scripts/globus-vararg-enums-doxygen-filter.pl deleted file mode 100755 index c5b819fbc9..0000000000 --- a/common/source/scripts/globus-vararg-enums-doxygen-filter.pl +++ /dev/null @@ -1,296 +0,0 @@ -#!/usr/bin/perl - -# -# Copyright 1999-2006 University of Chicago -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# this script expects source file as an arg - -# types are defined with -# GlobusVarArgDefine(name, rettype, function, ... /* fixed params */) -# the enum will be the first param after the fixed params followed by -# any params defined in the GlobusVarArgEnum block - -# enums can be preceded with 2 comment blocks, the first starting with -# GlobusVarArgEnum() The second is the vararg -# parameter list - -use strict; - -# these two are used as 'static' variables for following function -my $line = ''; -my $comment = ''; -# function returns either whole comment or everything between comments -sub get_next_blob() -{ - my $blob = ''; - - if(!$line && !defined($line = )) - { - return ''; - } - - while($line) - { - if($comment) - { - # still looking for the end of the comment - if($line =~ m/\*\//) - { - my $comment_end = $line; - - # extract the comment portion - $comment_end =~ s/(.*?\*\/).*\n?/$1/; - $comment_end = $comment . $comment_end; - $comment = ''; - - # keep remainder of line - $line =~ s/.*?\*\/(.*)/$1/; - - return $comment_end; - } - - $comment .= $line; - } - elsif($line =~ m/\/\*/) - { - # got a beginning of a comment - my $prefix = $line; - - # keep the comment portion - $line =~ s/.*?\/\*(.*)/$1/; - - # save the preceding portion - $prefix =~ s/(.*?)\/\*.*\n?/$1/; - $blob .= $prefix; - - # make sure this isn't a /* embedded in a string - # this does not catch multi-line strings (which are deprecated in C) - # this is hacky perl which counts the number of matches in a string - my $count = () = $prefix =~ m/(?; - } - - # only get here on eof - if(!$blob) - { - $blob = $comment; - } - return $blob; -} - -sub strip_comments($) -{ - my $str = shift; - return join("", split(/(?:^\s*(?:\/\*+|\*+(?!\/)))|(?:\*+\/)/m, $str)); -} - -sub normalize_params($) -{ - my $str = shift; - $str =~ s/^\s*(.*?)\s*$/$1/s; # trim whitespace from ends - $str =~ s/\s+/ /sg; # collaspe all whitespace into single space - $str =~ s/\s*,\s*/, /sg; # make all ',' have only one space on right - return $str; -} - -############################################################################ - -my $source_file = shift(@ARGV) || die("Error: Missing argument!"); -my %types; -my $functions = ''; - -open(SOURCE, $source_file) - || die("Error: could not open $source_file"); - -while((my $blob = get_next_blob())) -{ - if($blob =~ m/^\/\*/) - { - my $stripped = strip_comments($blob); - my @matches = ($stripped =~ m/GlobusVarArgDefine\(\s*(.*?)\s*\)/sg); - - if(@matches) - { - # strip from blob - $blob =~ s/GlobusVarArgDefine\(.*?\)//sg; - foreach my $match (@matches) - { - my @params = split(/\s*,\s*/s, $match); - if(@params >= 3) - { - my $type = shift(@params); - my $rettype = shift(@params); - my $func_name = shift(@params); - - $types{$type} = { - 'rettype' => $rettype, - 'name' => $func_name, - 'begin_prototype' => - '(' . normalize_params(join(',', @params)) }; - } - else - { - print(STDERR - "Warning: GlobusVarArgDefine has too few args\n"); - } - } - } - elsif($stripped =~ s/^.*GlobusVarArgEnum\((.*?)\).*$/$1/s) - { - # stripped types that we need to output for - my @types = split(/\s*,\s*/s, $stripped); - my $docblock; - my $end_prototype = ')'; - - # strip GlobusVarArgEnum from blob - $blob =~ s/GlobusVarArgEnum\(.*?\)/\@overload/s; - $docblock = $blob . "\n"; - - # next blob is either an optional prototype comment or the enum - $blob = get_next_blob(); - # we might get all whitespace first - if($blob =~ m/^\s+$/s) - { - $blob = get_next_blob(); - } - - if($blob =~ m/^\/\*/) - { - # we've got the var arg parameters now - $blob = strip_comments($blob); - if(!($blob =~ m/^\s*$/s)) - { - $end_prototype = - ', ' . normalize_params($blob) . $end_prototype; - } - - $blob = get_next_blob(); - } - - while($blob =~ m/^((\/\*)|(\s*$))/) - { - # any additional comments or whitespace we just spew out - print($blob); - $blob = get_next_blob(); - } - - # blob now has to be enum or bust - my $enum = $blob; - if($enum =~ s/^\s*(\w+).*$/$1/s) - { - my $comment = ' /** See usage for: '; - my $found = 0; - - # create function sigs - foreach my $type (@types) - { - if(defined($types{$type})) - { - my $function = $types{$type}{'name'} . - $types{$type}{'begin_prototype'} . ', ' . - $enum . $end_prototype; - - $functions .= $docblock . - $types{$type}{'rettype'} . " $function;\n"; - - if($found) - { - $comment .= ', '; - } - - $comment .= "\@link $function " . - $types{$type}{'name'} . ' @endlink'; - $found = 1; - } - else - { - print(STDERR - "Warning: undefined type '$type' in GlobusVarArgEnum\n"); - } - } - - $comment .= " */\n"; - if($found) - { - $blob = $comment . $blob; - if(0) - { - # add comment with references to usage - if($blob =~ m/[^,}]*,/) - { - $blob =~ s/^(\s*\w+\s*(=[^,]+)?,)/$1$comment/s; - } - else - { - # last enum in the block - $blob =~ - s/^(\s*\w+(\s*=[^}]+?(?=\n\s*(}|$)))?)/$1$comment/s; - } - } - } - else - { - print($docblock); - } - } - else - { - # not enum, warn and spew docblock - print(STDERR - "Warning: missing enum value after GlobusVarArgEnum block\n"); - print($docblock); - } - } - } - - print($blob); -} - -print($functions); - -exit(0); diff --git a/packaging/debian/globus-common/debian/changelog.in b/packaging/debian/globus-common/debian/changelog.in index e71fbdc6db..cfb9f367bf 100644 --- a/packaging/debian/globus-common/debian/changelog.in +++ b/packaging/debian/globus-common/debian/changelog.in @@ -1,3 +1,9 @@ +globus-common (18.8-1+gct.@distro@) @distro@; urgency=medium + + * Remove unused doxygen filter + + -- Mattias Ellert Thu, 12 Mar 2020 01:50:16 +0100 + globus-common (18.7-1+gct.@distro@) @distro@; urgency=medium * Make makefiles exit sooner on errors diff --git a/packaging/debian/globus-common/debian/libglobus-common-dev.install b/packaging/debian/globus-common/debian/libglobus-common-dev.install index 07e173acf4..dfe9a79df9 100644 --- a/packaging/debian/globus-common/debian/libglobus-common-dev.install +++ b/packaging/debian/globus-common/debian/libglobus-common-dev.install @@ -3,4 +3,3 @@ debian/tmp/usr/lib/*/libglobus_common.so debian/tmp/usr/lib/*/libglobus_memory_debug.so debian/tmp/usr/lib/*/pkgconfig/globus-common.pc debian/tmp/usr/bin/globus-makefile-header -debian/tmp/usr/share/globus/globus-vararg-enums-doxygen-filter.pl diff --git a/packaging/fedora/globus-common.spec b/packaging/fedora/globus-common.spec index a45d00a062..88193144e0 100644 --- a/packaging/fedora/globus-common.spec +++ b/packaging/fedora/globus-common.spec @@ -3,7 +3,7 @@ Name: globus-common %global soname 0 %global _name %(echo %{name} | tr - _) -Version: 18.7 +Version: 18.8 Release: 1%{?dist} Summary: Grid Community Toolkit - Common Library @@ -228,8 +228,6 @@ make %{?_smp_mflags} check VERBOSE=1 NO_EXTERNAL_NET=1 %{_libdir}/libglobus_memory_debug.so %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/globus-makefile-header -%dir %{_datadir}/globus -%{_datadir}/globus/globus-vararg-enums-doxygen-filter.pl %files doc %defattr(-,root,root,-) @@ -240,6 +238,9 @@ make %{?_smp_mflags} check VERBOSE=1 NO_EXTERNAL_NET=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 18.8-1 +- Remove unused doxygen filter + * Tue Mar 10 2020 Mattias Ellert - 18.7-1 - Make makefiles exit sooner on errors From af288c794fc8c4d75bcdd8f08c0178ee7ab0979f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 12 Mar 2020 01:07:09 +0100 Subject: [PATCH 4/5] Fix spelling --- packaging/debian/globus-xio/debian/changelog.in | 6 ++++++ packaging/fedora/globus-xio.spec | 5 ++++- xio/src/configure.ac | 2 +- xio/src/test/Makefile.am | 2 +- xio/src/test/test-common.pl | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packaging/debian/globus-xio/debian/changelog.in b/packaging/debian/globus-xio/debian/changelog.in index 6e903068cc..eb0e5f4414 100644 --- a/packaging/debian/globus-xio/debian/changelog.in +++ b/packaging/debian/globus-xio/debian/changelog.in @@ -1,3 +1,9 @@ +globus-xio (6.4-1+gct.@distro@) @distro@; urgency=medium + + * Fix spelling + + -- Mattias Ellert Thu, 12 Mar 2020 01:05:19 +0100 + globus-xio (6.3-1+gct.@distro@) @distro@; urgency=medium * Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-xio.spec b/packaging/fedora/globus-xio.spec index 79e81dfc1e..bad4cd7584 100644 --- a/packaging/fedora/globus-xio.spec +++ b/packaging/fedora/globus-xio.spec @@ -3,7 +3,7 @@ Name: globus-xio %global soname 0 %global _name %(echo %{name} | tr - _) -Version: 6.3 +Version: 6.4 Release: 1%{?dist} Summary: Grid Community Toolkit - Globus XIO Framework @@ -133,6 +133,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 6.4-1 +- Fix spelling + * Tue Mar 10 2020 Mattias Ellert - 6.3-1 - Make makefiles exit sooner on errors diff --git a/xio/src/configure.ac b/xio/src/configure.ac index 78dcce8a51..d81cc37398 100644 --- a/xio/src/configure.ac +++ b/xio/src/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_xio], [6.3], [https://github.com/gridcf/gct/issues]) +AC_INIT([globus_xio], [6.4], [https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(MAJOR_VERSION, [${PACKAGE_VERSION%%.*}]) AC_SUBST(MINOR_VERSION, [${PACKAGE_VERSION##*.}]) diff --git a/xio/src/test/Makefile.am b/xio/src/test/Makefile.am index 4e1d991008..d0ab3bde6e 100644 --- a/xio/src/test/Makefile.am +++ b/xio/src/test/Makefile.am @@ -55,7 +55,7 @@ endif TESTS = $(check_SCRIPTS) $(check_PROGRAMS_NO_SCRIPT) TESTS_ENVIRONMENT = \ - export XIO_TEST_OUPUT_DIR=test_output/$$$$ \ + export XIO_TEST_OUTPUT_DIR=test_output/$$$$ \ TEST_DATA_DIR=$(TEST_DATA_DIR) ; AM_CPPFLAGS = \ diff --git a/xio/src/test/test-common.pl b/xio/src/test/test-common.pl index 4fbd8e8464..31e51de98b 100755 --- a/xio/src/test/test-common.pl +++ b/xio/src/test/test-common.pl @@ -27,7 +27,7 @@ sub run_test my $cmd=(shift); my $test_str=(shift); my ($errors,$rc) = ("",0); - my $output_dir=$ENV{'XIO_TEST_OUPUT_DIR'}; + my $output_dir=$ENV{'XIO_TEST_OUTPUT_DIR'}; # delete the output dir if it exists $rc = system("mkdir -p $output_dir"); From c7b0cdd0d6b4dedf1743aa68528d31d8901ba9fc Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 10 Mar 2020 17:40:09 +0100 Subject: [PATCH 5/5] Add BuildRequires perl-interpreter Add additional perl dependencies for tests --- packaging/fedora/globus-common.spec | 6 ++++- packaging/fedora/globus-ftp-client.spec | 22 ++++++++++++++++++- packaging/fedora/globus-gass-copy.spec | 19 +++++++++++++++- .../globus-gram-job-manager-condor.spec | 6 ++++- .../fedora/globus-gram-job-manager-fork.spec | 6 ++++- .../fedora/globus-gram-job-manager-lsf.spec | 6 ++++- .../fedora/globus-gram-job-manager-pbs.spec | 6 ++++- .../globus-gram-job-manager-scripts.spec | 6 ++++- .../fedora/globus-gram-job-manager-sge.spec | 6 ++++- .../fedora/globus-gram-job-manager-slurm.spec | 6 ++++- packaging/fedora/globus-gram-job-manager.spec | 17 +++++++++++++- packaging/fedora/globus-gram-protocol.spec | 6 ++++- .../fedora/globus-gsi-openssl-error.spec | 10 ++++++++- packaging/fedora/globus-gsi-proxy-ssl.spec | 10 ++++++++- packaging/fedora/globus-gsi-sysconfig.spec | 12 +++++++++- packaging/fedora/globus-gss-assist.spec | 18 ++++++++++++++- packaging/fedora/globus-gssapi-gsi.spec | 10 ++++++++- packaging/fedora/globus-io.spec | 11 +++++++++- packaging/fedora/globus-net-manager.spec | 7 +++++- packaging/fedora/globus-proxy-utils.spec | 10 ++++++++- .../globus-scheduler-event-generator.spec | 10 ++++++++- packaging/fedora/globus-simple-ca.spec | 12 +++++++++- .../fedora/globus-xio-gridftp-driver.spec | 18 ++++++++++++++- packaging/fedora/globus-xio-gsi-driver.spec | 7 +++++- packaging/fedora/globus-xio.spec | 13 ++++++++++- packaging/fedora/myproxy.spec | 11 +++++++++- 26 files changed, 245 insertions(+), 26 deletions(-) diff --git a/packaging/fedora/globus-common.spec b/packaging/fedora/globus-common.spec index 88193144e0..f0b3ce52a4 100644 --- a/packaging/fedora/globus-common.spec +++ b/packaging/fedora/globus-common.spec @@ -4,7 +4,7 @@ Name: globus-common %global soname 0 %global _name %(echo %{name} | tr - _) Version: 18.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Common Library Group: System Environment/Libraries @@ -22,6 +22,7 @@ BuildRequires: libtool-ltdl-devel BuildRequires: doxygen %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif %if %{?suse_version}%{!?suse_version:0} @@ -238,6 +239,9 @@ make %{?_smp_mflags} check VERBOSE=1 NO_EXTERNAL_NET=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 18.8-2 +- Add BuildRequires perl-interpreter + * Thu Mar 12 2020 Mattias Ellert - 18.8-1 - Remove unused doxygen filter diff --git a/packaging/fedora/globus-ftp-client.spec b/packaging/fedora/globus-ftp-client.spec index fdc00839ea..4cd6410012 100644 --- a/packaging/fedora/globus-ftp-client.spec +++ b/packaging/fedora/globus-ftp-client.spec @@ -4,7 +4,7 @@ Name: globus-ftp-client %global soname 2 %global _name %(echo %{name} | tr - _) Version: 9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GridFTP Client Library Group: System Environment/Libraries @@ -32,7 +32,23 @@ BuildRequires: doxygen BuildRequires: globus-gridftp-server-devel >= 7 BuildRequires: globus-gridftp-server-progs >= 7 BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(Carp) +BuildRequires: perl(Config) +BuildRequires: perl(Cwd) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Copy) +BuildRequires: perl(FileHandle) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(lib) +BuildRequires: perl(POSIX) +BuildRequires: perl(strict) +BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Test::More) +BuildRequires: perl(vars) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name}%{soname} @@ -153,6 +169,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 9.4-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Thu Mar 12 2020 Mattias Ellert - 9.4-1 - Remove some unused test scripts diff --git a/packaging/fedora/globus-gass-copy.spec b/packaging/fedora/globus-gass-copy.spec index 3432dc328c..34e57e4d1f 100644 --- a/packaging/fedora/globus-gass-copy.spec +++ b/packaging/fedora/globus-gass-copy.spec @@ -4,7 +4,7 @@ Name: globus-gass-copy %global soname 2 %global _name %(echo %{name} | tr - _) Version: 10.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus Gass Copy Group: System Environment/Libraries @@ -32,8 +32,21 @@ BuildRequires: doxygen BuildRequires: globus-gridftp-server-devel >= 7 BuildRequires: globus-gridftp-server-progs >= 7 BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(Cwd) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Compare) +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(strict) +BuildRequires: perl(Symbol) BuildRequires: perl(Test::More) BuildRequires: perl(URI) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name}%{soname} @@ -170,6 +183,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 10.6-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 10.6-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-gram-job-manager-condor.spec b/packaging/fedora/globus-gram-job-manager-condor.spec index 75b33106d4..7d3a254e8d 100644 --- a/packaging/fedora/globus-gram-job-manager-condor.spec +++ b/packaging/fedora/globus-gram-job-manager-condor.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-condor %global _name %(echo %{name} | tr - _) Version: 3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Condor Job Manager Support Group: Applications/Internet @@ -15,6 +15,7 @@ BuildArch: noarch %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif Requires: globus-gram-job-manager >= 13 @@ -82,6 +83,9 @@ fi %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 3.0-2 +- Add BuildRequires perl-interpreter + * Sat Mar 31 2018 Mattias Ellert - 3.0-1 - First Grid Community Toolkit release diff --git a/packaging/fedora/globus-gram-job-manager-fork.spec b/packaging/fedora/globus-gram-job-manager-fork.spec index 2b356fafea..b3a8682f1b 100644 --- a/packaging/fedora/globus-gram-job-manager-fork.spec +++ b/packaging/fedora/globus-gram-job-manager-fork.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-fork %global _name %(echo %{name} | tr - _) Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Fork Job Manager Support Group: Applications/Internet @@ -19,6 +19,7 @@ BuildRequires: globus-scheduler-event-generator-devel >= 4 BuildRequires: globus-gram-protocol-devel >= 11 %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif # A requirement on globus-gram-job-manager would make sense. @@ -172,6 +173,9 @@ fi %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/fork %changelog +* Thu Mar 12 2020 Mattias Ellert - 3.1-2 +- Add BuildRequires perl-interpreter + * Thu Jul 18 2019 Mattias Ellert - 3.1-1 - Add AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS diff --git a/packaging/fedora/globus-gram-job-manager-lsf.spec b/packaging/fedora/globus-gram-job-manager-lsf.spec index 95171a06d3..f9ca018b68 100644 --- a/packaging/fedora/globus-gram-job-manager-lsf.spec +++ b/packaging/fedora/globus-gram-job-manager-lsf.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-lsf %global _name %(echo %{name} | tr - _) Version: 3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - LSF Job Manager Support Group: Applications/Internet @@ -17,6 +17,7 @@ BuildRequires: globus-common-devel >= 14 BuildRequires: globus-scheduler-event-generator-devel >= 4 %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif Requires: globus-gram-job-manager >= 13 @@ -169,6 +170,9 @@ fi %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/lsf %changelog +* Thu Mar 12 2020 Mattias Ellert - 3.0-2 +- Add BuildRequires perl-interpreter + * Sat Mar 31 2018 Mattias Ellert - 3.0-1 - First Grid Community Toolkit release diff --git a/packaging/fedora/globus-gram-job-manager-pbs.spec b/packaging/fedora/globus-gram-job-manager-pbs.spec index 411b5b97b7..3da27afdc6 100644 --- a/packaging/fedora/globus-gram-job-manager-pbs.spec +++ b/packaging/fedora/globus-gram-job-manager-pbs.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-pbs %global _name %(echo %{name} | tr - _) Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - PBS Job Manager Support Group: Applications/Internet @@ -17,6 +17,7 @@ BuildRequires: globus-common-devel >= 14 BuildRequires: globus-scheduler-event-generator-devel >= 4 %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif Requires: globus-gram-job-manager >= 13 @@ -167,6 +168,9 @@ fi %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/pbs %changelog +* Thu Mar 12 2020 Mattias Ellert - 3.1-2 +- Add BuildRequires perl-interpreter + * Thu Jul 18 2019 Mattias Ellert - 3.1-1 - Add AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS diff --git a/packaging/fedora/globus-gram-job-manager-scripts.spec b/packaging/fedora/globus-gram-job-manager-scripts.spec index ba5cfd40e3..f730afba43 100644 --- a/packaging/fedora/globus-gram-job-manager-scripts.spec +++ b/packaging/fedora/globus-gram-job-manager-scripts.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-scripts %global _name %(echo %{name} | tr - _) Version: 7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GRAM Job ManagerScripts Group: Applications/Internet @@ -15,6 +15,7 @@ BuildArch: noarch %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif BuildRequires: perl(Pod::Html) @@ -91,6 +92,9 @@ sed '/$libdir =/d' \ %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 7.2-2 +- Add BuildRequires perl-interpreter + * Sat Jul 20 2019 Mattias Ellert - 7.2-1 - Repair broken perlmoduledir definition in globus-job-manager-script.pl diff --git a/packaging/fedora/globus-gram-job-manager-sge.spec b/packaging/fedora/globus-gram-job-manager-sge.spec index b301f1c86d..9e93ea6f52 100644 --- a/packaging/fedora/globus-gram-job-manager-sge.spec +++ b/packaging/fedora/globus-gram-job-manager-sge.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-sge %global _name %(echo %{name} | tr - _) Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Grid Engine Job Manager Support Group: Applications/Internet @@ -18,6 +18,7 @@ BuildRequires: globus-common-devel >= 14 BuildRequires: globus-scheduler-event-generator-devel >= 4 %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif Requires: globus-gram-job-manager >= 13 @@ -176,6 +177,9 @@ fi %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/sge %changelog +* Thu Mar 12 2020 Mattias Ellert - 3.1-2 +- Add BuildRequires perl-interpreter + * Thu Jul 18 2019 Mattias Ellert - 3.1-1 - Add AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS diff --git a/packaging/fedora/globus-gram-job-manager-slurm.spec b/packaging/fedora/globus-gram-job-manager-slurm.spec index b0a31b2786..6971f4f09c 100644 --- a/packaging/fedora/globus-gram-job-manager-slurm.spec +++ b/packaging/fedora/globus-gram-job-manager-slurm.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager-slurm %global _name %(echo %{name} | tr - _) Version: 3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - SLURM Job Manager Support Group: Applications/Internet @@ -16,6 +16,7 @@ BuildArch: noarch %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif Requires: globus-gram-job-manager >= 13 @@ -85,6 +86,9 @@ fi %doc %{_pkgdocdir}/LICENSE* %changelog +* Thu Mar 12 2020 Mattias Ellert - 3.0-2 +- Add BuildRequires perl-interpreter + * Sat Mar 31 2018 Mattias Ellert - 3.0-1 - First Grid Community Toolkit release diff --git a/packaging/fedora/globus-gram-job-manager.spec b/packaging/fedora/globus-gram-job-manager.spec index 97c4a00b5f..45a7b82716 100644 --- a/packaging/fedora/globus-gram-job-manager.spec +++ b/packaging/fedora/globus-gram-job-manager.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager %global _name %(echo %{name} | tr - _) Version: 15.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GRAM Jobmanager Group: Applications/Internet @@ -33,6 +33,7 @@ BuildRequires: libopenssl-devel BuildRequires: openssl-devel %endif BuildRequires: libxml2-devel +BuildRequires: perl-interpreter # Additional requirements for make check BuildRequires: globus-io-devel >= 9 BuildRequires: globus-gram-client-devel >= 3 @@ -47,6 +48,16 @@ BuildRequires: globus-proxy-utils >= 5 BuildRequires: globus-gsi-cert-utils-progs BuildRequires: globus-gram-job-manager-fork-setup-poll BuildRequires: openssl +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Compare) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Globus::Core::Paths) +BuildRequires: perl(Globus::GRAM::Error) +BuildRequires: perl(IO::File) +BuildRequires: perl(IPC::Open2) +BuildRequires: perl(POSIX) +BuildRequires: perl(strict) +BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Test) BuildRequires: perl(Test::More) @@ -158,6 +169,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %{_libdir}/libglobus_seg_job_manager.so %changelog +* Tue Mar 10 2020 Mattias Ellert - 15.4-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Fri Feb 15 2019 Mattias Ellert - 15.4-1 - Add su option to logrotate file diff --git a/packaging/fedora/globus-gram-protocol.spec b/packaging/fedora/globus-gram-protocol.spec index 1681585798..a01a9c1169 100644 --- a/packaging/fedora/globus-gram-protocol.spec +++ b/packaging/fedora/globus-gram-protocol.spec @@ -4,7 +4,7 @@ Name: globus-gram-protocol %global soname 3 %global _name %(echo %{name} | tr - _) Version: 13.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GRAM Protocol Library Group: System Environment/Libraries @@ -21,6 +21,7 @@ BuildRequires: globus-gss-assist-devel >= 8 BuildRequires: doxygen %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: perl-generators +BuildRequires: perl-interpreter %endif # Additional requirements for make check BuildRequires: openssl @@ -157,6 +158,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 13.3-2 +- Add BuildRequires perl-interpreter + * Tue Mar 10 2020 Mattias Ellert - 13.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-gsi-openssl-error.spec b/packaging/fedora/globus-gsi-openssl-error.spec index cc4d4a497d..c5c2d81e08 100644 --- a/packaging/fedora/globus-gsi-openssl-error.spec +++ b/packaging/fedora/globus-gsi-openssl-error.spec @@ -4,7 +4,7 @@ Name: globus-gsi-openssl-error %global soname 0 %global _name %(echo %{name} | tr - _) Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus OpenSSL Error Handling Group: System Environment/Libraries @@ -22,6 +22,10 @@ BuildRequires: openssl-devel %endif BuildRequires: doxygen # Additional requirements for make check +BuildRequires: perl-interpreter +BuildRequires: perl(File::Basename) +BuildRequires: perl(lib) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) %if %{?suse_version}%{!?suse_version:0} @@ -138,6 +142,10 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 4.2-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 4.2-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-gsi-proxy-ssl.spec b/packaging/fedora/globus-gsi-proxy-ssl.spec index 08bfec1adf..bfa814d00a 100644 --- a/packaging/fedora/globus-gsi-proxy-ssl.spec +++ b/packaging/fedora/globus-gsi-proxy-ssl.spec @@ -4,7 +4,7 @@ Name: globus-gsi-proxy-ssl %global soname 1 %global _name %(echo %{name} | tr - _) Version: 6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus GSI Proxy SSL Library Group: System Environment/Libraries @@ -21,6 +21,10 @@ BuildRequires: openssl-devel %endif BuildRequires: doxygen # Additional requirements for make check +BuildRequires: perl-interpreter +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Compare) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) %if %{?suse_version}%{!?suse_version:0} @@ -138,6 +142,10 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 6.4-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 6.4-1 - Remove unused TESTS.pl script diff --git a/packaging/fedora/globus-gsi-sysconfig.spec b/packaging/fedora/globus-gsi-sysconfig.spec index 00bafeec8e..3449f63823 100644 --- a/packaging/fedora/globus-gsi-sysconfig.spec +++ b/packaging/fedora/globus-gsi-sysconfig.spec @@ -4,7 +4,7 @@ Name: globus-gsi-sysconfig %global soname 1 %global _name %(echo %{name} | tr - _) Version: 9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus GSI System Config Library Group: System Environment/Libraries @@ -24,7 +24,13 @@ BuildRequires: openssl-devel %endif BuildRequires: doxygen # Additional requirements for make check +BuildRequires: perl-interpreter +BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Temp) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) +BuildRequires: perl(warnings) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name}%{soname} @@ -144,6 +150,10 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 9.3-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 9.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-gss-assist.spec b/packaging/fedora/globus-gss-assist.spec index 922f0dbdd7..82652c485a 100644 --- a/packaging/fedora/globus-gss-assist.spec +++ b/packaging/fedora/globus-gss-assist.spec @@ -4,7 +4,7 @@ Name: globus-gss-assist %global soname 3 %global _name %(echo %{name} | tr - _) Version: 12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GSSAPI Assist library Group: System Environment/Libraries @@ -26,7 +26,19 @@ BuildRequires: perl-generators %endif # Additional requirements for make check BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(English) +BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Copy) +BuildRequires: perl(FileHandle) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(POSIX) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) +BuildRequires: perl(warnings) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name}%{soname} @@ -173,6 +185,10 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 12.3-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 12.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-gssapi-gsi.spec b/packaging/fedora/globus-gssapi-gsi.spec index d061b8cdfd..c8ed40cef4 100644 --- a/packaging/fedora/globus-gssapi-gsi.spec +++ b/packaging/fedora/globus-gssapi-gsi.spec @@ -4,7 +4,7 @@ Name: globus-gssapi-gsi %global soname 4 %global _name %(echo %{name} | tr - _) Version: 14.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GSSAPI library Group: System Environment/Libraries @@ -35,6 +35,10 @@ BuildRequires: libtool-ltdl-devel BuildRequires: doxygen # Additional requirements for make check BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Temp) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) %if %{?suse_version}%{!?suse_version:0} @@ -154,6 +158,10 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 14.13-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 14.13-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-io.spec b/packaging/fedora/globus-io.spec index d7f652d3c0..b5fd9eae5f 100644 --- a/packaging/fedora/globus-io.spec +++ b/packaging/fedora/globus-io.spec @@ -4,7 +4,7 @@ Name: globus-io %global soname 3 %global _name %(echo %{name} | tr - _) Version: 12.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - uniform I/O interface Group: System Environment/Libraries @@ -22,6 +22,11 @@ BuildRequires: globus-xio-gsi-driver-devel >= 2 BuildRequires: globus-gssapi-error-devel >= 4 # Additional requirements for make check BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(File::Compare) +BuildRequires: perl(File::Temp) +BuildRequires: perl(POSIX) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) %if %{?suse_version}%{!?suse_version:0} @@ -116,6 +121,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Mar 10 2020 Mattias Ellert - 12.2-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Jul 30 2019 Mattias Ellert - 12.2-1 - Fix test race condition diff --git a/packaging/fedora/globus-net-manager.spec b/packaging/fedora/globus-net-manager.spec index 77a90b5b1d..7fb45bcc69 100644 --- a/packaging/fedora/globus-net-manager.spec +++ b/packaging/fedora/globus-net-manager.spec @@ -4,7 +4,7 @@ Name: globus-net-manager %global soname 0 %global _name %(echo %{name} | tr - _) Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Network Manager Library Group: System Environment/Libraries @@ -17,6 +17,8 @@ BuildRequires: gcc BuildRequires: globus-common-devel >= 15.27 BuildRequires: globus-xio-devel >= 5 BuildRequires: doxygen +BuildRequires: perl-interpreter +BuildRequires: perl(strict) %if %{?fedora}%{!?fedora:0} >= 30 || %{?rhel}%{!?rhel:0} >= 8 BuildRequires: python3-devel %else @@ -205,6 +207,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 1.5-2 +- Add BuildRequires perl-interpreter + * Tue Mar 10 2020 Mattias Ellert - 1.5-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-proxy-utils.spec b/packaging/fedora/globus-proxy-utils.spec index 4fb97e21ec..9d9add1826 100644 --- a/packaging/fedora/globus-proxy-utils.spec +++ b/packaging/fedora/globus-proxy-utils.spec @@ -3,7 +3,7 @@ Name: globus-proxy-utils %global _name %(echo %{name} | tr - _) Version: 7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus GSI Proxy Utility Programs Group: Applications/Internet @@ -30,6 +30,10 @@ BuildRequires: openssl-devel %endif # Additional requirements for make check BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(File::Temp) +BuildRequires: perl(IO::Handle) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) %description @@ -73,6 +77,10 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 7.1-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Sat May 05 2018 Mattias Ellert - 7.1-1 - Increase default proxy key size to 2048 bits - Use 2048 bit RSA key for tests diff --git a/packaging/fedora/globus-scheduler-event-generator.spec b/packaging/fedora/globus-scheduler-event-generator.spec index f1dc17fc7f..308b632b79 100644 --- a/packaging/fedora/globus-scheduler-event-generator.spec +++ b/packaging/fedora/globus-scheduler-event-generator.spec @@ -4,7 +4,7 @@ Name: globus-scheduler-event-generator %global soname 0 %global _name %(echo %{name} | tr - _) Version: 6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Scheduler Event Generator Group: System Environment/Libraries @@ -28,6 +28,10 @@ BuildRequires: doxygen BuildRequires: insserv %endif # Additional requirements for make check +BuildRequires: perl-interpreter +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Compare) +BuildRequires: perl(File::Temp) BuildRequires: perl(Test::More) %if %{?suse_version}%{!?suse_version:0} @@ -235,6 +239,10 @@ fi %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 6.3-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 6.3-1 - Remove unused TESTS.pl script diff --git a/packaging/fedora/globus-simple-ca.spec b/packaging/fedora/globus-simple-ca.spec index 84307a991d..68c7cdfc7f 100644 --- a/packaging/fedora/globus-simple-ca.spec +++ b/packaging/fedora/globus-simple-ca.spec @@ -3,7 +3,7 @@ Name: globus-simple-ca %global _name %(echo %{name} | tr - _) Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Grid Community Toolkit - Simple CA Utility Group: Applications/Internet @@ -16,7 +16,13 @@ BuildArch: noarch BuildRequires: openssl # Additional requirements for make check BuildRequires: globus-common-progs >= 14 +BuildRequires: perl-interpreter +BuildRequires: perl(File::Temp) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(strict) +BuildRequires: perl(Symbol) BuildRequires: perl(Test::More) +BuildRequires: perl(warnings) Requires: globus-common-progs >= 14 Requires: globus-gsi-cert-utils-progs @@ -110,6 +116,10 @@ fi %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 5.1-3 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Fri Sep 13 2019 Mattias Ellert - 5.1-2 - Check that hostname command succeeds in post install script diff --git a/packaging/fedora/globus-xio-gridftp-driver.spec b/packaging/fedora/globus-xio-gridftp-driver.spec index f266d7091a..ae1ada9e93 100644 --- a/packaging/fedora/globus-xio-gridftp-driver.spec +++ b/packaging/fedora/globus-xio-gridftp-driver.spec @@ -3,7 +3,7 @@ Name: globus-xio-gridftp-driver %global _name %(echo %{name} | tr - _) Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus XIO GridFTP Driver Group: System Environment/Libraries @@ -18,11 +18,23 @@ BuildRequires: globus-xio-devel >= 3 BuildRequires: globus-ftp-client-devel >= 7 BuildRequires: globus-xio-gsi-driver-devel >= 2 BuildRequires: doxygen +BuildRequires: perl-interpreter +BuildRequires: perl(strict) # Additional requirements for make check BuildRequires: globus-gridftp-server-devel >= 7 BuildRequires: globus-gridftp-server-progs >= 7 BuildRequires: openssl +BuildRequires: perl(Cwd) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Compare) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(lib) +BuildRequires: perl(Symbol) BuildRequires: perl(Test::More) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name} @@ -140,6 +152,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Tue Mar 10 2020 Mattias Ellert - 3.3-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Tue Mar 10 2020 Mattias Ellert - 3.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-xio-gsi-driver.spec b/packaging/fedora/globus-xio-gsi-driver.spec index 4836ccc627..177fd65e51 100644 --- a/packaging/fedora/globus-xio-gsi-driver.spec +++ b/packaging/fedora/globus-xio-gsi-driver.spec @@ -3,7 +3,7 @@ Name: globus-xio-gsi-driver %global _name %(echo %{name} | tr - _) Version: 5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus XIO GSI Driver Group: System Environment/Libraries @@ -19,6 +19,8 @@ BuildRequires: globus-gssapi-error-devel >= 4 BuildRequires: globus-gssapi-gsi-devel >= 13 BuildRequires: globus-common-devel >= 14 BuildRequires: doxygen +BuildRequires: perl-interpreter +BuildRequires: perl(strict) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name} @@ -134,6 +136,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 5.3-2 +- Add BuildRequires perl-interpreter + * Tue Mar 10 2020 Mattias Ellert - 5.3-1 - Make makefiles exit sooner on errors diff --git a/packaging/fedora/globus-xio.spec b/packaging/fedora/globus-xio.spec index bad4cd7584..c5cc19cedd 100644 --- a/packaging/fedora/globus-xio.spec +++ b/packaging/fedora/globus-xio.spec @@ -4,7 +4,7 @@ Name: globus-xio %global soname 0 %global _name %(echo %{name} | tr - _) Version: 6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus XIO Framework Group: System Environment/Libraries @@ -16,8 +16,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc BuildRequires: globus-common-devel >= 14 BuildRequires: doxygen +BuildRequires: perl-interpreter +BuildRequires: perl(strict) # Additional requirements for make check +BuildRequires: perl(File::Basename) +BuildRequires: perl(IPC::Open2) +BuildRequires: perl(lib) +BuildRequires: perl(POSIX) BuildRequires: perl(Test::More) +BuildRequires: perl(warnings) %if %{?suse_version}%{!?suse_version:0} %global mainpkg lib%{_name}%{soname} @@ -133,6 +140,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Thu Mar 12 2020 Mattias Ellert - 6.4-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Thu Mar 12 2020 Mattias Ellert - 6.4-1 - Fix spelling diff --git a/packaging/fedora/myproxy.spec b/packaging/fedora/myproxy.spec index 480f9d9e8b..279eb63e97 100644 --- a/packaging/fedora/myproxy.spec +++ b/packaging/fedora/myproxy.spec @@ -3,7 +3,7 @@ Name: myproxy %global soname 6 Version: 6.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage X.509 Public Key Infrastructure (PKI) security credentials Group: Applications/Internet @@ -40,6 +40,11 @@ BuildRequires: insserv BuildRequires: globus-proxy-utils BuildRequires: globus-gsi-cert-utils-progs BuildRequires: openssl +BuildRequires: perl-interpreter +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Temp) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(Socket) %if ! %{?suse_version}%{!?suse_version:0} BuildRequires: voms-clients %endif @@ -382,6 +387,10 @@ fi %doc %{_pkgdocdir}/LICENSE* %changelog +* Thu Mar 12 2020 Mattias Ellert - 6.2.6-2 +- Add BuildRequires perl-interpreter +- Add additional perl dependencies for tests + * Sat Jul 13 2019 Mattias Ellert - 6.2.6-1 - Remove LICENSE.globus file