cerc-io/solidity
15
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

Allow SOLIDITY_BUILD_DIR outside of REPO_ROOT in scripts that respect this variable

Browse Source
This commit is contained in:
Kamil Śliwak 2020-04-17 15:02:40 +02:00
parent a80b032081
commit 3e65bcfd7f
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.md
View File

@ -9,6 +9,9 @@ Compiler Features:
Bugfixes: Bugfixes:
* Type Checker: Disallow ``virtual`` and ``override`` for constructors. * Type Checker: Disallow ``virtual`` and ``override`` for constructors.
Build System:
* soltest.sh: ``SOLIDITY_BUILD_DIR`` is no longer relative to ``REPO_ROOT`` to allow for build directories outside of the source tree.
### 0.6.6 (2020-04-09) ### 0.6.6 (2020-04-09)

4
scripts/ASTImportTest.sh
View File

@ -5,8 +5,8 @@
# and exporting it again. The second JSON should be identical to the first # and exporting it again. The second JSON should be identical to the first
REPO_ROOT=$(readlink -f "$(dirname "$0")"/..) REPO_ROOT=$(readlink -f "$(dirname "$0")"/..)
SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-build} SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
SOLC=${REPO_ROOT}/${SOLIDITY_BUILD_DIR}/solc/solc SOLC=${SOLIDITY_BUILD_DIR}/solc/solc
SPLITSOURCES=${REPO_ROOT}/scripts/splitSources.py SPLITSOURCES=${REPO_ROOT}/scripts/splitSources.py
SYNTAXTESTS_DIR="${REPO_ROOT}/test/libsolidity/syntaxTests" SYNTAXTESTS_DIR="${REPO_ROOT}/test/libsolidity/syntaxTests"

2
scripts/docs_version_pragma_check.sh
View File

@ -28,7 +28,7 @@ set -e
## GLOBAL VARIABLES ## GLOBAL VARIABLES
REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-build} SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
source "${REPO_ROOT}/scripts/common.sh" source "${REPO_ROOT}/scripts/common.sh"
source "${REPO_ROOT}/scripts/common_cmdline.sh" source "${REPO_ROOT}/scripts/common_cmdline.sh"

6
scripts/soltest.sh
View File

@ -6,7 +6,7 @@ USE_DEBUGGER=0
DEBUGGER="gdb --args" DEBUGGER="gdb --args"
BOOST_OPTIONS= BOOST_OPTIONS=
SOLTEST_OPTIONS= SOLTEST_OPTIONS=
SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-build} SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
usage() { usage() {
echo 2>&1 " echo 2>&1 "
@ -23,7 +23,7 @@ Options:
Important environment variables: Important environment variables:
SOLIDITY_BUILD_DIR: Sets directory under the repository root of where test/soltest should be found. SOLIDITY_BUILD_DIR: Sets directory where test/soltest should be found.
The default is \"${SOLIDITY_BUILD_DIR}\". The default is \"${SOLIDITY_BUILD_DIR}\".
" "
} }
@ -64,4 +64,4 @@ if [ "$USE_DEBUGGER" -ne "0" ]; then
DEBUG_PREFIX=${DEBUGGER} DEBUG_PREFIX=${DEBUGGER}
fi fi
exec ${DEBUG_PREFIX} ${REPO_ROOT}/${SOLIDITY_BUILD_DIR}/test/soltest ${BOOST_OPTIONS} -- --testpath ${REPO_ROOT}/test ${SOLTEST_OPTIONS} exec ${DEBUG_PREFIX} ${SOLIDITY_BUILD_DIR}/test/soltest ${BOOST_OPTIONS} -- --testpath ${REPO_ROOT}/test ${SOLTEST_OPTIONS}

4
scripts/tests.sh
View File

@ -29,7 +29,7 @@
set -e set -e
REPO_ROOT="$(dirname "$0")/.." REPO_ROOT="$(dirname "$0")/.."
SOLIDITY_BUILD_DIR="${SOLIDITY_BUILD_DIR:-build}" SOLIDITY_BUILD_DIR="${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}"
source "${REPO_ROOT}/scripts/common.sh" source "${REPO_ROOT}/scripts/common.sh"
@ -116,7 +116,7 @@ do
fi fi
set +e set +e
"$REPO_ROOT"/${SOLIDITY_BUILD_DIR}/test/soltest --show-progress $log -- --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" $SMT_FLAGS $force_abiv2_flag "${SOLIDITY_BUILD_DIR}"/test/soltest --show-progress $log -- --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" $SMT_FLAGS $force_abiv2_flag
if test "0" -ne "$?"; then if test "0" -ne "$?"; then
exit 1 exit 1

10
test/cmdlineTests.sh
View File

@ -31,19 +31,19 @@ set -e
## GLOBAL VARIABLES ## GLOBAL VARIABLES
REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-build} SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
source "${REPO_ROOT}/scripts/common.sh" source "${REPO_ROOT}/scripts/common.sh"
source "${REPO_ROOT}/scripts/common_cmdline.sh" source "${REPO_ROOT}/scripts/common_cmdline.sh"
case "$OSTYPE" in case "$OSTYPE" in
msys) msys)
SOLC="$REPO_ROOT/${SOLIDITY_BUILD_DIR}/solc/Release/solc.exe" SOLC="${SOLIDITY_BUILD_DIR}/solc/Release/solc.exe"
# prevents msys2 path translation for a remapping test # prevents msys2 path translation for a remapping test
export MSYS2_ARG_CONV_EXCL="=" export MSYS2_ARG_CONV_EXCL="="
;; ;;
*) *)
SOLC="$REPO_ROOT/${SOLIDITY_BUILD_DIR}/solc/solc" SOLC="${SOLIDITY_BUILD_DIR}/solc/solc"
;; ;;
esac esac
echo "${SOLC}" echo "${SOLC}"
@ -431,8 +431,8 @@ SOLTMPDIR=$(mktemp -d)
"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/ "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/ docs "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/ docs
echo *.sol | xargs -P 4 -n 50 "$REPO_ROOT"/${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer --quiet --input-files echo *.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
echo *.sol | xargs -P 4 -n 50 "$REPO_ROOT"/${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer --without-optimizer --quiet --input-files echo *.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
) )
rm -rf "$SOLTMPDIR" rm -rf "$SOLTMPDIR"