From 981ff308ecfbd596d7f94852462591316bcaa2e7 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 9 Feb 2018 17:21:36 +0100
Subject: Split solcjs and external tests.

---
 test/solcjsTests.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100755 test/solcjsTests.sh

(limited to 'test')

diff --git a/test/solcjsTests.sh b/test/solcjsTests.sh
new file mode 100755
index 00000000..b6d2a017
--- /dev/null
+++ b/test/solcjsTests.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Bash script to execute the Solidity tests.
+#
+# The documentation for solidity is hosted at:
+#
+#     https://solidity.readthedocs.org
+#
+# ------------------------------------------------------------------------------
+# 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) 2017 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+if [ ! -f "$1" ]
+then
+  echo "Usage: $0 <path to soljson.js>"
+  exit 1
+fi
+
+SOLJSON="$1"
+
+DIR=$(mktemp -d)
+(
+    echo "Preparing solc-js..."
+    git clone --depth 1 https://github.com/ethereum/solc-js "$DIR"
+    cd "$DIR"
+    # disable "prepublish" script which downloads the latest version
+    # (we will replace it anyway and it is often incorrectly cached
+    # on travis)
+    npm config set script.prepublish ''
+    npm install
+
+    # Replace soljson with current build
+    echo "Replacing soljson.js"
+    rm -f soljson.js
+    cp "$SOLJSON" soljson.js
+
+    # Update version (needed for some tests)
+    VERSION=$("$REPO_ROOT/scripts/get_version.sh")
+    echo "Updating package.json to version $VERSION"
+    npm version --no-git-tag-version $VERSION
+
+    echo "Running solc-js tests..."
+    npm run test
+)
+rm -rf "$DIR"
-- 
cgit v1.2.3


From 937f16afef910f6faf1e29a7dafb5c7c699e4de9 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 9 Feb 2018 18:08:29 +0100
Subject: Handle version for solcjs tests.

---
 test/solcjsTests.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/solcjsTests.sh b/test/solcjsTests.sh
index b6d2a017..27797cb4 100755
--- a/test/solcjsTests.sh
+++ b/test/solcjsTests.sh
@@ -28,13 +28,14 @@
 
 set -e
 
-if [ ! -f "$1" ]
+if [ ! -f "$1" -o -z "$2" ]
 then
-  echo "Usage: $0 <path to soljson.js>"
+  echo "Usage: $0 <path to soljson.js> <version>"
   exit 1
 fi
 
 SOLJSON="$1"
+VERSION="$2"
 
 DIR=$(mktemp -d)
 (
@@ -53,7 +54,6 @@ DIR=$(mktemp -d)
     cp "$SOLJSON" soljson.js
 
     # Update version (needed for some tests)
-    VERSION=$("$REPO_ROOT/scripts/get_version.sh")
     echo "Updating package.json to version $VERSION"
     npm version --no-git-tag-version $VERSION
 
-- 
cgit v1.2.3