diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | t/fixtures/sample.env (renamed from t/fixtures/localhost.conf) | 0 | ||||
| -rw-r--r-- | t/fixtures/sample.input (renamed from t/fixtures/input) | 0 | ||||
| -rw-r--r-- | t/fixtures/sample.plan (renamed from t/fixtures/testplan) | 0 | ||||
| -rw-r--r-- | t/samplerun.t | 12 | ||||
| -rwxr-xr-x | xmpt | 15 |
6 files changed, 14 insertions, 15 deletions
@@ -108,5 +108,5 @@ corresponding server data is in 'input'. So to run a quick-and-dirty test, execute: #+BEGIN -% xmpt -c t/fixtures/localhost.conf -p t/fixtures/testplan < t/fixtures/input +% xmpt -e t/fixtures/sample.env -p t/fixtures/sample.plan < t/fixtures/sample.input #+END diff --git a/t/fixtures/localhost.conf b/t/fixtures/sample.env index bc462d7..bc462d7 100644 --- a/t/fixtures/localhost.conf +++ b/t/fixtures/sample.env diff --git a/t/fixtures/input b/t/fixtures/sample.input index 2d508fe..2d508fe 100644 --- a/t/fixtures/input +++ b/t/fixtures/sample.input diff --git a/t/fixtures/testplan b/t/fixtures/sample.plan index ba7fcaa..ba7fcaa 100644 --- a/t/fixtures/testplan +++ b/t/fixtures/sample.plan diff --git a/t/samplerun.t b/t/samplerun.t index 4df0d7d..d9dba31 100644 --- a/t/samplerun.t +++ b/t/samplerun.t @@ -7,12 +7,12 @@ use IO::File; use strict; use warnings; -my $config = 't/fixtures/localhost.conf'; -my $testplan = 't/fixtures/testplan'; -my $input = 't/fixtures/input'; +my $env = 't/fixtures/sample.env'; +my $testplan = 't/fixtures/sample.plan'; +my $input = 't/fixtures/sample.input'; do { - my $cmd = "./xmpt -c $config -p $testplan"; + my $cmd = "./xmpt -e $env -p $testplan"; my $xmptfh = new IO::File("|$cmd") or BAIL_OUT "Can't run '$cmd': $!.\n"; my $inputfh = new IO::File($input) or BAIL_OUT "Couldn't open $input for reading: $!.\n"; @@ -25,7 +25,7 @@ do { }; do { - my $cmd = "./xmpt -t 1 -c $config -p $testplan cat 2>/dev/null"; + my $cmd = "./xmpt -t 1 -e $env -p $testplan cat 2>/dev/null"; local $SIG{ALRM} = sub { fail("Timed out running $cmd.") }; alarm 5; system $cmd; @@ -33,7 +33,7 @@ do { }; do { - my $cmd = "./xmpt -c $config -p $testplan cat $input 2>/dev/null"; + my $cmd = "./xmpt -e $env -p $testplan cat $input 2>/dev/null"; local $SIG{ALRM} = sub { fail("Timed out running $cmd.") }; alarm 10; ok((system($cmd) >> 8) == 0, 'I/O redirected to cat'); @@ -13,7 +13,7 @@ use warnings; our $VERSION = '0'; my $verbose; -my $configpath = 'localhost.conf'; +my $envpath = 'localhost.env'; my $timeout = 5; my $testplanpath = 'testplan'; my $templatepath = 'xml'; @@ -21,7 +21,7 @@ my @libs; my $help; GetOptions('verbose|v' => \$verbose, - 'config|c=s' => \$configpath, + 'env|e=s' => \$envpath, 'timeout|t=i' => \$timeout, 'testplan|p=s' => \$testplanpath, 'templates|d=s' => \$templatepath, @@ -31,7 +31,7 @@ usage(0) if $help; $| = 1; -my %conf = read_conf($configpath); +local %evalpkg::env = read_env($envpath); my @plans = load_plans($testplanpath, $templatepath); # Ignore SIGPIPE at the top level, since it only matters when reading @@ -47,16 +47,16 @@ if (@ARGV) { binmode($inh, ':utf8'); binmode($outh, ':utf8'); -eval_in($inh, $outh, \%conf, @plans); +eval_in($inh, $outh, @plans); waitpid($pid, 0) if $pid; # TODO: swap over to Pod::Usage. sub usage { - print STDERR "Usage: $0 [-hv] [-c config] [-t seconds] [-p testplan] [-d templatedir] [-l libpath] [command]\n"; + print STDERR "Usage: $0 [-hv] [-e envpath] [-t seconds] [-p testplan] [-d templatedir] [-l libpath] [command]\n"; exit shift; } -sub read_conf { +sub read_env { my ($filen) = @_; my $fh = new IO::File("<$filen") || @@ -152,14 +152,13 @@ sub thunk { local $evalpkg::arg = shift; my $rc = eval $b; $@ && - die "Error in $fn:$line: $@\ttestplan: $testplanpath\n\tconfig: $configpath\n"; + die "Error in $fn:$line: $@\ttestplan: $testplanpath\n\tenvpath: $envpath\n"; $rc; }] } sub eval_in { local ($evalpkg::in, $evalpkg::out) = (shift, shift); - local %evalpkg::env = %{shift @_}; my @plans = @_; foreach my $k (keys %evalpkg::env) { |