Skip to content

Run CircleCi in BUILD=debug #5929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilzbach merged 2 commits into from
Dec 16, 2017
Merged

Run CircleCi in BUILD=debug #5929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae6912c
Run CircleCi in BUILD=debug
wilzbach Dec 15, 2017
e1e96f0
Use $(BUILD) instead of hard-coding "release"
wilzbach Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions circleci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
DUB=${DUB:-$HOME/dlang/dub/dub}
N=2
CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
BUILD="debug"

case $CIRCLE_NODE_INDEX in
0) MODEL=64 ;;
Expand Down Expand Up @@ -90,8 +91,8 @@ setup_repos()
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"

# build dmd and druntime
make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD all
make -j$N -C ../druntime -f posix.mak MODEL=$MODEL HOST_DMD=$DMD
make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD all
make -j$N -C ../druntime -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD
}

# verify style guide
Expand All @@ -100,7 +101,7 @@ style_lint()
# dscanner needs a more up-to-date DMD version
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$DSCANNER_DMD_VER --activate)"

make -f posix.mak style_lint DUB=$DUB
make -f posix.mak style_lint DUB=$DUB BUILD=$BUILD
}

# run unittest with coverage
Expand All @@ -116,7 +117,7 @@ coverage()

# So instead we run all tests individually (hoping that that doesn't break any tests).
# -cov is enabled by the %.test target itself
make -j$N -f posix.mak $(find std etc -name "*.d" | sed "s/[.]d$/.test/")
make -j$N -f posix.mak BUILD=$BUILD $(find std etc -name "*.d" | sed "s/[.]d$/.test/")

# Remove coverage information from lines with non-deterministic coverage.
# These lines are annotated with a comment containing "nocoverage".
Expand All @@ -132,7 +133,7 @@ publictests()
fi
git -C ../tools checkout df3dfa3061d25996ac98158d3bdb3525c8d89445

make -f posix.mak -j$N publictests DUB=$DUB
make -f posix.mak -j$N publictests DUB=$DUB BUILD=$BUILD
}

case $1 in
Expand Down
4 changes: 2 additions & 2 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ ifeq ($(OS),win32wine)
DMD = wine dmd.exe
RUN = wine
else
DMD = $(DMD_DIR)/generated/$(OS)/release/$(MODEL)/dmd
DMD = $(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
ifeq ($(OS),win32)
CC = dmc
else
Expand Down Expand Up @@ -545,7 +545,7 @@ style: publictests style_lint
# runs static code analysis with Dscanner
dscanner: | $(DSCANNER_DIR)/dsc
@echo "Running DScanner"
$(DEBUGGER) -ex=r -ex=backtrace -ex=quit --args $(DSCANNER_DIR)/dsc --config .dscanner.ini --styleCheck etc std -I.
$(DEBUGGER) -q -ex run -ex bt -batch --args $(DSCANNER_DIR)/dsc --config .dscanner.ini --styleCheck etc std -I.

style_lint: dscanner $(LIB)
@echo "Check for trailing whitespace"
Expand Down