diff options
author | Russ Allbery <rra@stanford.edu> | 2008-04-24 02:41:12 +0000 |
---|---|---|
committer | Russ Allbery <rra@stanford.edu> | 2008-04-24 02:41:12 +0000 |
commit | 3ebbd3e716bfd4ac2b645a9701c51bb7c3afba0d (patch) | |
tree | 8b2a44248bbbd2206b8407fcd23828c93e32ea0e /tests/server | |
parent | 92ff7f21ad0b167f8d742a9d7b5f93704a57619c (diff) |
Perl 5.8 is required to run the test suite, but IO::String is not.
Diffstat (limited to 'tests/server')
-rw-r--r-- | tests/server/admin-t.in | 9 | ||||
-rw-r--r-- | tests/server/backend-t.in | 9 | ||||
-rw-r--r-- | tests/server/keytab-t.in | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/tests/server/admin-t.in b/tests/server/admin-t.in index 177ef70..be40880 100644 --- a/tests/server/admin-t.in +++ b/tests/server/admin-t.in @@ -9,7 +9,6 @@ # See LICENSE for licensing terms. use strict; -use IO::String; use Test::More tests => 54; # Create a dummy class for Wallet::Admin that prints what method was called @@ -84,10 +83,10 @@ eval { do '@abs_top_srcdir@/server/wallet-admin' }; # Wallet::Admin class. sub run_admin { my (@args) = @_; - my $result; - my $output = IO::String->new (\$result); - $output->autoflush (1); - select $output; + my $result = ''; + open (OUTPUT, '>', \$result) or die "cannot create output string: $!\n"; + select OUTPUT; + local $| = 1; eval { command (@args) }; my $error = $@; select STDOUT; diff --git a/tests/server/backend-t.in b/tests/server/backend-t.in index 0b65c07..bc708f2 100644 --- a/tests/server/backend-t.in +++ b/tests/server/backend-t.in @@ -9,7 +9,6 @@ # See LICENSE for licensing terms. use strict; -use IO::String; use Test::More tests => 1263; # Create a dummy class for Wallet::Server that prints what method was called @@ -171,10 +170,10 @@ eval { do '@abs_top_srcdir@/server/wallet-backend' }; # Wallet::Server class. sub run_backend { my (@args) = @_; - my $result; - my $output = IO::String->new (\$result); - $output->autoflush (1); - select $output; + my $result = ''; + open (OUTPUT, '>', \$result) or die "cannot create output string: $!\n"; + select OUTPUT; + local $| = 1; eval { command (@args) }; my $error = $@; select STDOUT; diff --git a/tests/server/keytab-t.in b/tests/server/keytab-t.in index dbc653e..f74267d 100644 --- a/tests/server/keytab-t.in +++ b/tests/server/keytab-t.in @@ -11,7 +11,6 @@ use strict; use vars qw($CONFIG $KADMIN $SYSLOG $TMP); -use IO::String; use Test::More tests => 63; # Load the keytab-backend code and override various settings. @@ -25,10 +24,10 @@ $TMP = '.'; # Run the keytab backend. sub run_backend { my (@args) = @_; - my $result; - my $output = IO::String->new (\$result); - $output->autoflush (1); - select $output; + my $result = ''; + open (OUTPUT, '>', \$result) or die "cannot create output string: $!\n"; + select OUTPUT; + local $| = 1; eval { download (@args) }; my $error = $@; select STDOUT; |