Rename pipefile to stdin-file.
diff --git a/regress/NiHTest.pm b/regress/NiHTest.pm
index 93fd385..eedc187 100644
--- a/regress/NiHTest.pm
+++ b/regress/NiHTest.pm
@@ -79,12 +79,6 @@
# mkdir MODE NAME
# create directory NAME with permissions MODE.
#
-# pipefile FILE
-# pipe FILE to program's stdin.
-#
-# stdin TEST
-# Provide TEXT to program's stdin.
-#
# precheck COMMAND ARGS ...
# if COMMAND exits with non-zero status, skip test.
#
@@ -108,6 +102,12 @@
# stderr-replace REGEX REPLACEMENT
# run regex replacement over expected and got stderr output.
#
+# stdin TEST
+# Provide TEXT to program's stdin.
+#
+# stdin-file FILE
+# pipe FILE to program's stdin.
+#
# stdout TEXT
# program is expected to print TEXT to stdout. If multiple
# stdout commands are used, the messages are expected in
@@ -161,7 +161,6 @@
'file-del' => { type => 'string string' },
'file-new' => { type => 'string string' },
mkdir => { type => 'string string' },
- pipefile => { type => 'string', once => 1 },
precheck => { type => 'string...' },
preload => { type => 'string', once => 1 },
program => { type => 'string', once => 1 },
@@ -170,6 +169,7 @@
stderr => { type => 'string' },
'stderr-replace' => { type => 'string string' },
stdin => { type => 'string' },
+ 'stdin-file' => { type => 'string', once => 1 },
stdout => { type => 'string' },
touch => { type => 'int string' },
ulimit => { type => 'char string' }
@@ -456,7 +456,7 @@
$self->run_precheck() if ($self->{test}->{precheck});
$self->end_test('SKIP') if ($self->{test}->{preload} && ($^O eq 'darwin' || $^O eq 'MSWin32'));
- $self->end_test('SKIP') if ($self->{test}->{stdin} || $self->{test}->{pipefile} && $^O eq 'MSWin32');
+ $self->end_test('SKIP') if ($self->{test}->{stdin} || $self->{test}->{'stdin-file'} && $^O eq 'MSWin32');
}
@@ -956,8 +956,8 @@
}
}
- if ($test{pipefile} && $test{stdin}) {
- $self->warn_file("both pipefile and stdin provided, choose one");
+ if ($test{'stdin-file'} && $test{stdin}) {
+ $self->warn_file("both stdin-file and stdin provided, choose one");
$ok = 0;
}
@@ -1175,8 +1175,8 @@
### TODO: catch errors?
my $pid;
- if ($self->{test}->{pipefile}) {
- open(SPLAT, '<', $self->{test}->{pipefile});
+ if ($self->{test}->{'stdin-file'}) {
+ open(SPLAT, '<', $self->{test}->{'stdin-file'});
my $is_marked = eof SPLAT; # mark used
$pid = open3("<&SPLAT", $stdout, $stderr, @cmd);
}
diff --git a/regress/fdopen_ok.test b/regress/fdopen_ok.test
index 192419c..ff478bb 100644
--- a/regress/fdopen_ok.test
+++ b/regress/fdopen_ok.test
@@ -1,7 +1,7 @@
# zip_fdopen: stdin opens fine
program ../src/ziptool
args /dev/stdin stat 0
-pipefile test.zip
+stdin-file test.zip
return 0
file test.zip test.zip test.zip
stdout name: 'test'
@@ -12,4 +12,4 @@
stdout crc: '3bb935c6'
stdout compression method: '0'
stdout encryption method: '0'
-stdout
\ No newline at end of file
+stdout
