cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5171 from ethereum/fixCommandlineTests

Browse Source 
Fix commandline tests for release version.
This commit is contained in:
chriseth 2018-10-09 14:13:23 +02:00 committed by GitHub
commit 7b61586530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/cmdlineErrorReports/too_long_line.sol.ref
View File

@ -1,4 +1,3 @@
too_long_line.sol:1:1: Warning: Source file does not specify required compiler version!
contract C {
^ (Relevant source part starts here and spans across multiple lines).

1
test/cmdlineErrorReports/too_long_line_both_sides_short.sol.ref
View File

@ -1,4 +1,3 @@
too_long_line_both_sides_short.sol:1:1: Warning: Source file does not specify required compiler version!
contract C {
^ (Relevant source part starts here and spans across multiple lines).

1
test/cmdlineErrorReports/too_long_line_edge_in.sol.ref
View File

@ -1,4 +1,3 @@
too_long_line_edge_in.sol:1:1: Warning: Source file does not specify required compiler version!
contract C {
^ (Relevant source part starts here and spans across multiple lines).

1
test/cmdlineErrorReports/too_long_line_edge_out.sol.ref
View File

@ -1,4 +1,3 @@
too_long_line_edge_out.sol:1:1: Warning: Source file does not specify required compiler version!
contract C {
^ (Relevant source part starts here and spans across multiple lines).

1
test/cmdlineErrorReports/too_long_line_left_short.sol.ref
View File

@ -1,4 +1,3 @@
too_long_line_left_short.sol:1:1: Warning: Source file does not specify required compiler version!
contract C {
^ (Relevant source part starts here and spans across multiple lines).

1
test/cmdlineErrorReports/too_long_line_right_short.sol.ref
View File

@ -1,4 +1,3 @@
too_long_line_right_short.sol:1:1: Warning: Source file does not specify required compiler version!
contract C {
^ (Relevant source part starts here and spans across multiple lines).

7
test/cmdlineTests.sh
View File

@ -123,7 +123,8 @@ test_solc_file_input_failures() {
exitCode=$?
set -e
stderr=`sed 's/.*This is a pre-release compiler version, please do not use it in production.*$//' $stderr_path`
sed -i -e '/^Warning: This is a pre-release compiler version, please do not use it in production./d' "$stderr_path"
sed -i -e 's/ \?Consider adding "pragma .*$//' "$stderr_path"
if [[ $exitCode -eq 0 ]]; then
printError "Incorrect exit code. Expected failure (non-zero) but got success (0)."
@ -141,12 +142,12 @@ test_solc_file_input_failures() {
exit 1
fi
if [[ "$stderr" != "${stderr_expected}" ]]; then
if [[ "$(cat $stderr_path)" != "${stderr_expected}" ]]; then
printError "Incorrect output on stderr received. Expected:"
echo -e "${stderr_expected}"
printError "But got:"
echo $stderr
cat $stderr_path
rm -f $stdout_path $stderr_path
exit 1
fi