AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Update tests to support mixed C++/D in the D module

Browse Source
This commit is contained in:
Mkr 2018-05-02 20:20:48 -07:00 committed by Tom van Dijck
parent e7b9e63118
commit 3c6edd6e39
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/d/tests/test_dmd.lua
View File

@ -76,7 +76,7 @@
end
function suite.dmd_imports()
includedirs { "dir1", "dir2/" }
importdirs { "dir1", "dir2/" }
prepare_cfg({ m.make.imports })
test.capture [[
IMPORTS += -Idir1 -Idir2
@ -86,7 +86,7 @@
function suite.dmd_dFlags()
prepare_cfg({ m.make.dFlags })
test.capture [[
ALL_DFLAGS += $(DFLAGS) -release $(VERSIONS) $(DEBUG) $(IMPORTS) $(ARCH)
ALL_DFLAGS += $(DFLAGS) -release $(VERSIONS) $(DEBUG) $(IMPORTS) $(STRINGIMPORTS) $(ARCH)
]]
end

4
modules/d/tests/test_gdc.lua
View File

@ -76,7 +76,7 @@
end
function suite.dmd_imports()
includedirs { "dir1", "dir2/" }
importdirs { "dir1", "dir2/" }
prepare_cfg({ m.make.imports })
test.capture [[
IMPORTS += -Idir1 -Idir2
@ -86,7 +86,7 @@
function suite.dmd_dFlags()
prepare_cfg({ m.make.dFlags })
test.capture [[
ALL_DFLAGS += $(DFLAGS) -frelease $(VERSIONS) $(DEBUG) $(IMPORTS) $(ARCH)
ALL_DFLAGS += $(DFLAGS) -frelease $(VERSIONS) $(DEBUG) $(IMPORTS) $(STRINGIMPORTS) $(ARCH)
]]
end

14
modules/d/tests/test_gmake.lua
View File

@ -53,7 +53,7 @@ $(TARGET): $(SOURCEFILES) $(LDDEPS)
end
function suite.make_targetRules_separateCompilation()
flags { "SeparateCompilation" }
compilationmodel "File"
prepare()
m.make.targetRules(prj)
test.capture [[
@ -67,7 +67,7 @@ $(TARGET): $(OBJECTS) $(LDDEPS)
function suite.make_targetRules_mixedCompilation()
configuration { "Release" }
flags { "SeparateCompilation" }
compilationmodel "File"
prepare()
m.make.targetRules(prj)
test.capture [[
@ -99,7 +99,7 @@ endif
function suite.make_fileRules_separateCompilation()
files { "blah.d" }
flags { "SeparateCompilation" }
compilationmodel "File"
prepare()
m.make.dFileRules(prj)
test.capture [[
@ -112,7 +112,7 @@ $(OBJDIR)/blah.o: blah.d
function suite.make_fileRules_mixedCompilation()
files { "blah.d" }
configuration { "Release" }
flags { "SeparateCompilation" }
compilationmodel "File"
prepare()
m.make.dFileRules(prj)
test.capture [[
@ -136,7 +136,7 @@ SOURCEFILES := \
function suite.make_objects_separateCompilation()
files { "blah.d" }
flags { "SeparateCompilation" }
compilationmodel "File"
prepare()
m.make.objects(prj)
test.capture [[
@ -149,7 +149,7 @@ OBJECTS := \
function suite.make_objects_mixedCompilation()
files { "blah.d" }
configuration { "Release" }
flags { "SeparateCompilation" }
compilationmodel "File"
files { "blah2.d" }
prepare()
m.make.objects(prj)
@ -186,7 +186,7 @@ all: $(TARGETDIR) prebuild prelink $(TARGET)
end
function suite.make_allRules_separateCompilation()
flags { "SeparateCompilation" }
compilationmodel "File"
prepare_cfg({ m.make.allRules })
test.capture [[
all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)

4
modules/d/tests/test_ldc.lua
View File

@ -76,7 +76,7 @@
end
function suite.dmd_imports()
includedirs { "dir1", "dir2/" }
importdirs { "dir1", "dir2/" }
prepare_cfg({ m.make.imports })
test.capture [[
IMPORTS += -I=dir1 -I=dir2
@ -86,7 +86,7 @@
function suite.dmd_dFlags()
prepare_cfg({ m.make.dFlags })
test.capture [[
ALL_DFLAGS += $(DFLAGS) -release $(VERSIONS) $(DEBUG) $(IMPORTS) $(ARCH)
ALL_DFLAGS += $(DFLAGS) -release $(VERSIONS) $(DEBUG) $(IMPORTS) $(STRINGIMPORTS) $(ARCH)
]]
end