aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-02-09 17:30:03 +0800
committerGitHub <noreply@github.com>2017-02-09 17:30:03 +0800
commit1b7bb371eec07590177d6af75a90a1e29f3f9d3f (patch)
tree5c53534cf0e1ef5ed4a863675eb8ef52bbca6f79
parent4c8d818826efa3274eb8ceab32e6dd655545617d (diff)
parent92fb07c78319c256a01c6146d83a7c9c7419a240 (diff)
downloaddexon-solidity-1b7bb371eec07590177d6af75a90a1e29f3f9d3f.tar.gz
dexon-solidity-1b7bb371eec07590177d6af75a90a1e29f3f9d3f.tar.zst
dexon-solidity-1b7bb371eec07590177d6af75a90a1e29f3f9d3f.zip
Merge pull request #1668 from ethereum/build-test-progress
Show progress in test builds
-rw-r--r--appveyor.yml2
-rwxr-xr-xscripts/tests.sh4
-rw-r--r--test/RPCSession.cpp3
3 files changed, 3 insertions, 6 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 85fb36f2..86a689a7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -62,7 +62,7 @@ test_script:
- ps: Start-Sleep -s 100
- cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION%
- copy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll" .
- - soltest.exe -- --ipcpath \\.\pipe\geth.ipc
+ - soltest.exe --show-progress -- --ipcpath \\.\pipe\geth.ipc
artifacts:
- path: solidity-windows.zip
diff --git a/scripts/tests.sh b/scripts/tests.sh
index ba932da5..8edfda0b 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -62,9 +62,9 @@ echo "--> IPC available."
# And then run the Solidity unit-tests (once without optimization, once with),
# pointing to that IPC endpoint.
echo "--> Running tests without optimizer..."
- "$REPO_ROOT"/build/test/soltest -- --ipcpath /tmp/test/geth.ipc && \
+ "$REPO_ROOT"/build/test/soltest --show-progress -- --ipcpath /tmp/test/geth.ipc && \
echo "--> Running tests WITH optimizer..." && \
- "$REPO_ROOT"/build/test/soltest -- --optimize --ipcpath /tmp/test/geth.ipc
+ "$REPO_ROOT"/build/test/soltest --show-progress -- --optimize --ipcpath /tmp/test/geth.ipc
ERROR_CODE=$?
pkill eth || true
sleep 4
diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp
index 5cd1bc7e..968d77b1 100644
--- a/test/RPCSession.cpp
+++ b/test/RPCSession.cpp
@@ -111,9 +111,6 @@ string IPCSocket::sendRequest(string const& _req)
if (!fSuccess)
BOOST_FAIL("ReadFile from pipe failed");
- // This is needed for Appveyor, otherwise it may terminate
- // the session due to the inactivity.
- cerr << ".";
return returnStr;
#else
send(m_socket, _req.c_str(), _req.length(), 0);