Skip to content
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

Jump to bottom

Improve testing #239

Merged
merged 3 commits into from
Jul 3, 2017
Merged

Improve testing #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86bbd69
HALT on deprecation messages
wilzbach Jul 3, 2017
4a256e8
Fix implict string concatenation in dman.d
wilzbach Jul 3, 2017
90ecf25
Build all + dman on Travis
wilzbach Jul 3, 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
18 changes: 10 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ language: d
d:
- dmd
sudo: false
addons:
apt:
packages:
- g++-multilib
- libcurl3-gnutls:i386
env:
- MODEL=32
- MODEL=64

matrix:
include:
- env: MODEL=64
- env: MODEL=32
addons:
apt:
packages:
- g++-multilib
- libcurl4-openssl-dev:i386

script:
- ./travis.sh
2 changes: 1 addition & 1 deletion dman.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ string CHeader(string topic)
static string[] dmccmds =
[
"assert.h", "complex.h", "ctype.h", "fenv.h",
"float.h", "locale.h", "math.h", "setjmp.h,"
"float.h", "locale.h", "math.h", "setjmp.h",
"signal.h", "stdarg.h", "stddef.h", "stdio.h",
"stdlib.h", "string.h", "time.h", "gc.h",
"bios.h", "cerror.h", "disp.h", "dos.h",
Expand Down
11 changes: 2 additions & 9 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif
# default include/link paths, override by setting DFLAGS (e.g. make -f posix.mak DFLAGS=-I/foo)
DFLAGS = -I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) \
-L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL) $(MODEL_FLAG)
DFLAGS += -w
DFLAGS += -w -de

TOOLS = \
$(ROOT)/rdmd \
Expand Down Expand Up @@ -61,14 +61,7 @@ dustmite: $(ROOT)/dustmite
$(ROOT)/dustmite: DustMite/dustmite.d DustMite/splitter.d
$(DMD) $(DFLAGS) DustMite/dustmite.d DustMite/splitter.d -of$(@)

#dreadful custom step because of libcurl dmd linking problem (Bugzilla 7044)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's quite interesting that this isn't needed anymore, but pragma(lib, "curl") does the trick now.

$(CURL_TOOLS): $(ROOT)/%: %.d
$(DMD) $(DFLAGS) -c -of$(@).o $(<)
# grep for the linker invocation and append -lcurl
LINKCMD=$$($(DMD) $(DFLAGS) -v -of$(@) $(@).o 2>/dev/null | grep $(@).o); \
$${LINKCMD} -lcurl

$(TOOLS) $(DOC_TOOLS): $(ROOT)/%: %.d
$(TOOLS) $(DOC_TOOLS) $(CURL_TOOLS): $(ROOT)/%: %.d
$(DMD) $(DFLAGS) -of$(@) $(<)

ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG = # ???
Expand Down
1 change: 1 addition & 0 deletions travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ dub --version

test_rdmd

make -f posix.mak all DMD=$(which dmd)
make -f posix.mak test DMD=$(which dmd)