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 #8470 from ethereum/fix_smt_docs

Browse Source 
SMTChecker docs test may issue a warning
This commit is contained in:
Leonardo 2020-03-10 18:15:43 +01:00 committed by GitHub
commit 69645298da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/security-considerations.rst
View File

@ -547,6 +547,7 @@ not mean loss of proving power.
pragma solidity >=0.5.0; pragma solidity >=0.5.0;
pragma experimental SMTChecker; pragma experimental SMTChecker;
// This may report a warning if no SMT solver available.
contract Recover contract Recover
{ {
@ -601,6 +602,7 @@ types.
pragma solidity >=0.5.0; pragma solidity >=0.5.0;
pragma experimental SMTChecker; pragma experimental SMTChecker;
// This will report a warning // This will report a warning
contract Aliasing contract Aliasing
{ {
uint[] array; uint[] array;

11
test/cmdlineTests.sh
View File

@ -77,6 +77,11 @@ function compileFull()
expect_output=1 expect_output=1
shift; shift;
fi fi
if [[ $1 = '-o' ]]
then
expect_output=2
shift;
fi
local files="$*" local files="$*"
local output local output
@ -93,7 +98,7 @@ function compileFull()
if [[ \ if [[ \
"$exit_code" -ne "$expected_exit_code" || \ "$exit_code" -ne "$expected_exit_code" || \
( $expect_output -eq 0 && -n "$errors" ) || \ ( $expect_output -eq 0 && -n "$errors" ) || \
( $expect_output -ne 0 && -z "$errors" ) \ ( $expect_output -eq 1 && -z "$errors" ) \
]] ]]
then then
printError "Unexpected compilation result:" printError "Unexpected compilation result:"
@ -350,6 +355,10 @@ SOLTMPDIR=$(mktemp -d)
then then
opts="$opts -w" opts="$opts -w"
fi fi
if grep "This may report a warning" "$f" >/dev/null
then
opts="$opts -o"
fi
compileFull $opts "$SOLTMPDIR/$f" compileFull $opts "$SOLTMPDIR/$f"
done done
) )

7
test/libsolidity/SMTCheckerJSONTest.cpp
View File

@ -17,14 +17,18 @@
#include <test/libsolidity/SMTCheckerJSONTest.h> #include <test/libsolidity/SMTCheckerJSONTest.h>
#include <test/Common.h> #include <test/Common.h>
#include <libsolidity/formal/ModelChecker.h>
#include <libsolidity/interface/StandardCompiler.h> #include <libsolidity/interface/StandardCompiler.h>
#include <libsolutil/CommonIO.h> #include <libsolutil/CommonIO.h>
#include <libsolutil/JSON.h> #include <libsolutil/JSON.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
@ -50,6 +54,9 @@ SMTCheckerJSONTest::SMTCheckerJSONTest(string const& _filename, langutil::EVMVer
!m_smtResponses.isObject() !m_smtResponses.isObject()
) )
BOOST_THROW_EXCEPTION(runtime_error("Invalid JSON file.")); BOOST_THROW_EXCEPTION(runtime_error("Invalid JSON file."));
if (ModelChecker::availableSolvers().none())
m_shouldRun = false;
} }
TestCase::TestResult SMTCheckerJSONTest::run(ostream& _stream, string const& _linePrefix, bool _formatted) TestCase::TestResult SMTCheckerJSONTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)