diff --git a/CHANGELOG.md b/CHANGELOG.md index f068973..fb574b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ [issue1173]: https://github.com/dlang/dub/issues/1173 +v1.4.1 - 2017-08- +------------------- + v1.4.0 - 2017-07-19 ------------------- diff --git a/source/dub/version_.d b/source/dub/version_.d index cdab016..fa8350b 100644 --- a/source/dub/version_.d +++ b/source/dub/version_.d @@ -1,2 +1,2 @@ module dub.version_; -enum dubVersion = "v1.4.0"; +enum dubVersion = "v1.4.1-beta.1"; diff --git a/test/common.sh b/test/common.sh index b43c656..7bd2a27 100644 --- a/test/common.sh +++ b/test/common.sh @@ -6,8 +6,11 @@ function die() { local line=$1 local msg=${2:-command failed} - local rc=${3:-1} + local supplemental=${3:-} >&2 echo "[ERROR] $SOURCE_FILE:$1 $msg" - exit $rc + if [ ! -z "$supplemental" ]; then + echo "$supplemental" | >&2 sed 's|^| |g' + fi + exit 1 } trap 'die $LINENO' ERR diff --git a/test/feat663-search.sh b/test/feat663-search.sh index 4778a51..ab127cb 100755 --- a/test/feat663-search.sh +++ b/test/feat663-search.sh @@ -7,6 +7,6 @@ if ${DUB} search nonexistent123456789package 2>/dev/null; then die $LINENO '`dub search nonexistent123456789package` succeeded' fi -if ! ${DUB} search dub | grep -q '^dub'; then - die $LINENO '`dub search dub` failed' +if ! OUTPUT=$(${DUB} search dub -v 2>&1) || ! { echo "$OUTPUT" | grep -q '^dub (.*)\s'; } then + die $LINENO '`dub search dub` failed' "$OUTPUT" fi