diff options
| author | chriseth <chris@ethereum.org> | 2018-10-01 19:18:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 19:18:55 +0800 |
| commit | 658bef5a3845b78e1f9bc8965bbebbd567adbc1e (patch) | |
| tree | 3b8093c5d47129005fe02a30a044b29b43e7e0f7 | |
| parent | a17d480fc299eb3c81340b2b660b3163f6ebc3e4 (diff) | |
| parent | 25f35653407caac0da084e52f998c76b062f260c (diff) | |
| download | dexon-solidity-658bef5a3845b78e1f9bc8965bbebbd567adbc1e.tar.gz dexon-solidity-658bef5a3845b78e1f9bc8965bbebbd567adbc1e.tar.zst dexon-solidity-658bef5a3845b78e1f9bc8965bbebbd567adbc1e.zip | |
Merge pull request #5115 from mestorlx/cleancircleci
removed stray (B in CI test output
| -rwxr-xr-x | scripts/tests.sh | 10 | ||||
| -rwxr-xr-x | test/cmdlineTests.sh | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/scripts/tests.sh b/scripts/tests.sh index 1c0fc590..c284c05c 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -100,8 +100,14 @@ else log_directory="" fi -function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; } -function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; } +if [ "$CIRCLECI" ] +then + function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; } + function printError() { echo "$(tput setaf 1)$1$(tput setaf 7)"; } +else + function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; } + function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; } +fi printTask "Running commandline tests..." # Only run in parallel if this is run on CI infrastructure diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh index 78e45429..d7b95e8a 100755 --- a/test/cmdlineTests.sh +++ b/test/cmdlineTests.sh @@ -37,9 +37,15 @@ FULLARGS="--optimize --ignore-missing --combined-json abi,asm,ast,bin,bin-runtim echo "Checking that the bug list is up to date..." "$REPO_ROOT"/scripts/update_bugs_by_version.py -function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; } +if [ "$CIRCLECI" ] +then + function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; } + function printError() { echo "$(tput setaf 1)$1$(tput setaf 7)"; } +else + function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; } + function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; } +fi -function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; } function compileFull() { |