mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
cmdlineTests: Allow providing content of the standard input when not testing via Standard JSON
This commit is contained in:
parent
4e4f46cde5
commit
59ef75cf5a
@ -304,13 +304,22 @@ printTask "Running general commandline tests..."
|
|||||||
|
|
||||||
if [ "${inputFile}" = "${tdir}/input.json" ]
|
if [ "${inputFile}" = "${tdir}/input.json" ]
|
||||||
then
|
then
|
||||||
|
! [ -e "${tdir}/stdin" ] || { printError "Found a file called 'stdin' but redirecting standard input in JSON mode is not allowed."; exit 1; }
|
||||||
|
|
||||||
stdin="${inputFile}"
|
stdin="${inputFile}"
|
||||||
inputFile=""
|
inputFile=""
|
||||||
stdout="$(cat "${tdir}/output.json" 2>/dev/null || true)"
|
stdout="$(cat "${tdir}/output.json" 2>/dev/null || true)"
|
||||||
stdoutExpectationFile="${tdir}/output.json"
|
stdoutExpectationFile="${tdir}/output.json"
|
||||||
command_args="--standard-json "$(cat "${tdir}/args" 2>/dev/null || true)
|
command_args="--standard-json "$(cat "${tdir}/args" 2>/dev/null || true)
|
||||||
else
|
else
|
||||||
stdin=""
|
if [ -e "${tdir}/stdin" ]
|
||||||
|
then
|
||||||
|
stdin="${tdir}/stdin"
|
||||||
|
[ -f "${tdir}/stdin" ] || { printError "'stdin' is not a regular file."; exit 1; }
|
||||||
|
else
|
||||||
|
stdin=""
|
||||||
|
fi
|
||||||
|
|
||||||
stdout="$(cat "${tdir}/output" 2>/dev/null || true)"
|
stdout="$(cat "${tdir}/output" 2>/dev/null || true)"
|
||||||
stdoutExpectationFile="${tdir}/output"
|
stdoutExpectationFile="${tdir}/output"
|
||||||
command_args=$(cat "${tdir}/args" 2>/dev/null || true)
|
command_args=$(cat "${tdir}/args" 2>/dev/null || true)
|
||||||
|
1
test/cmdlineTests/stdin/args
Normal file
1
test/cmdlineTests/stdin/args
Normal file
@ -0,0 +1 @@
|
|||||||
|
-
|
5
test/cmdlineTests/stdin/err
Normal file
5
test/cmdlineTests/stdin/err
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
|
||||||
|
--> <stdin>
|
||||||
|
|
||||||
|
Warning: Source file does not specify required compiler version!
|
||||||
|
--> <stdin>
|
1
test/cmdlineTests/stdin/stdin
Normal file
1
test/cmdlineTests/stdin/stdin
Normal file
@ -0,0 +1 @@
|
|||||||
|
contract C {}
|
Loading…
Reference in New Issue
Block a user