aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-08-23 20:21:15 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-08-24 04:11:03 +0800
commite8d1658b583878bce1858d6dd748e83ce1450967 (patch)
treeb6c4cf7f1cf712832040fcccf79a6959f6bee43f
parente7832eccf4031c7157009c3912e4c076d8a683ff (diff)
downloaddexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.tar
dexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.tar.gz
dexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.tar.bz2
dexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.tar.lz
dexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.tar.xz
dexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.tar.zst
dexon-solidity-e8d1658b583878bce1858d6dd748e83ce1450967.zip
Add external tests.
-rwxr-xr-xscripts/test_emscripten.sh3
-rwxr-xr-xtest/externalTests.sh49
2 files changed, 52 insertions, 0 deletions
diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh
index a2dbe61c..f6846f1c 100755
--- a/scripts/test_emscripten.sh
+++ b/scripts/test_emscripten.sh
@@ -51,3 +51,6 @@ npm version $VERSION
echo "Running solc-js tests..."
npm run test
+
+echo "Running external tests...."
+"$REPO_ROOT"/test/externalTests.sh "$REPO_ROOT"/build/solc/soljson.js
diff --git a/test/externalTests.sh b/test/externalTests.sh
new file mode 100755
index 00000000..1b74561b
--- /dev/null
+++ b/test/externalTests.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Bash script to run external Solidity tests.
+#
+# Argument: Path to soljson.js to test.
+#
+# Requires npm, networking access and git to download the tests.
+#
+# ------------------------------------------------------------------------------
+# This file is part of solidity.
+#
+# solidity is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# solidity is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with solidity. If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2016 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+if [ ! -f "$1" ]
+then
+ echo "Usage: $0 <path to soljson.js>"
+ exit 1
+fi
+
+SOLJSON="$1"
+
+DIR=$(mktemp -d)
+(
+ cd "$DIR"
+ echo "Running Zeppelin tests..."
+ git clone https://github.com/OpenZeppelin/zeppelin-solidity.git
+ cd zeppelin-solidity
+ npm install
+ cp "$SOLJSON" ./node_modules/solc/soljson.js
+ npm run test
+)
+rm -rf "$DIR"