Skip to content

Run CircleCi with BUILD=debug #7528

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
dlang-bot merged 2 commits into from
Mar 29, 2020
Merged

Run CircleCi with BUILD=debug #7528

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
4268066
Run CircleCi with BUILD=debug
wilzbach Dec 26, 2017
bc48227
Make dhsell/test_shared.d aware of the current BUILD
MoonlightSentinel Mar 29, 2020
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
16 changes: 8 additions & 8 deletions .circleci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ coverage()
else
make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD ENABLE_WARNINGS=1 PIC="$PIC" all
fi
make -j$N -C ../druntime -f posix.mak MODEL=$MODEL PIC="$PIC"
make -j$N -C ../phobos -f posix.mak MODEL=$MODEL PIC="$PIC"
make -j$N -C ../druntime -f posix.mak MODEL=$MODEL PIC="$PIC" BUILD=$BUILD
make -j$N -C ../phobos -f posix.mak MODEL=$MODEL PIC="$PIC" BUILD=$BUILD

# FIXME
# Building d_do_test currently uses the host library for linking
Expand All @@ -133,19 +133,19 @@ coverage()

# rebuild dmd with coverage enabled
# use the just build dmd as host compiler this time
local build_path=generated/linux/release/$MODEL
local build_path=generated/linux/$BUILD/$MODEL
# `generated` gets cleaned in the next step, so we create another _generated
# The nested folder hierarchy is needed to conform to those specified in
# the generate dmd.conf
mkdir -p _${build_path}
cp $build_path/dmd _${build_path}/host_dmd
cp $build_path/dmd.conf _${build_path}
make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=../_${build_path}/host_dmd PIC="$PIC" clean
make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=../_${build_path}/host_dmd ENABLE_COVERAGE=1 ENABLE_WARNINGS=1 PIC="$PIC"
make -j$N -C src -f posix.mak MODEL=$MODEL BUILD=$BUILD HOST_DMD=../_${build_path}/host_dmd PIC="$PIC" clean
make -j$N -C src -f posix.mak MODEL=$MODEL BUILD=$BUILD HOST_DMD=../_${build_path}/host_dmd ENABLE_COVERAGE=1 ENABLE_WARNINGS=1 PIC="$PIC"

cp $build_path/dmd _${build_path}/host_dmd_cov
make -j1 -C src -f posix.mak MODEL=$MODEL HOST_DMD=../_${build_path}/host_dmd_cov ENABLE_COVERAGE=1 PIC="$PIC" unittest
make -j1 -C test start_all_tests MODEL=$MODEL ARGS="-O -inline -release" DMD_TEST_COVERAGE=1 PIC="$PIC" N=3
make -j1 -C src -f posix.mak MODEL=$MODEL BUILD=$BUILD HOST_DMD=../_${build_path}/host_dmd_cov ENABLE_COVERAGE=1 PIC="$PIC" unittest
make -j1 -C test start_all_tests MODEL=$MODEL BUILD=$BUILD ARGS="-O -inline -release" DMD_TEST_COVERAGE=1 PIC="$PIC" N=3
}

# Checks that all files have been committed and no temporary, untracked files exist.
Expand All @@ -166,7 +166,7 @@ check_clean_git()
# sanitycheck for the run_individual_tests script
check_run_individual()
{
local build_path=generated/linux/release/$MODEL
local build_path=generated/linux/$BUILD/$MODEL
"${build_path}/dmd" -I./test -i -run ./test/run.d test/runnable/template2962.d ./test/compilable/test14275.d
}

Expand Down
2 changes: 1 addition & 1 deletion test/dshell/test_shared.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ void main()

run("$DMD -m$MODEL -of$OUTPUT_BASE/a$EXE -defaultlib=libphobos2.so $EXTRA_FILES/test_shared.d");
run("$OUTPUT_BASE/a$EXE", stdout, [
"LD_LIBRARY_PATH" : "../../phobos/generated/"~OS~"/release/"~MODEL
"LD_LIBRARY_PATH" : "../../phobos/generated/"~OS~'/'~BUILD~'/'~MODEL
]);
}
1 change: 1 addition & 0 deletions test/tools/dshell_prebuilt/dshell_prebuilt.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ private alias requiredEnvVars = AliasSeq!(
"EXE", "OBJ",
"DMD", "DFLAGS",
"OS", "SEP", "DSEP",
"BUILD"
);
private alias allVars = AliasSeq!(
requiredEnvVars,
Expand Down