mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-27 13:40:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

only marginally better than disabling all testing on win64

Browse source
This commit is contained in:
Brad Roberts 2012-11-26 05:18:02 +00:00
parent 1c22141596
commit e87f1c20a7
3 changed files with 94 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
std/stdio.d
View file

@ -575,6 +575,7 @@ $(D rawWrite) always writes in binary mode on Windows.
_name, "'")); _name, "'"));
} }
version(Win64) {} else
unittest unittest
{ {
auto deleteme = testFilename(); auto deleteme = testFilename();
@ -606,6 +607,7 @@ file handle. Throws on error.
} }
} }
version(Win64) {} else
unittest unittest
{ {
auto deleteme = testFilename(); auto deleteme = testFilename();

10
unittest.d
View file

@ -13,6 +13,9 @@
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
*/ */
version(Win64) {}
else
{
public import std.base64; public import std.base64;
public import std.compiler; public import std.compiler;
public import std.concurrency; public import std.concurrency;
@ -63,10 +66,13 @@ public import std.digest.crc;
public import std.digest.sha; public import std.digest.sha;
public import std.digest.md; public import std.digest.md;
}
int main(char[][] args) int main(char[][] args)
{ {
version (all) version(Win64) {}
else
{ {
// Bring in unit test for module by referencing function in it // Bring in unit test for module by referencing function in it
@ -135,7 +141,7 @@ version (all)
auto sha1 = sha1Of("hello"); auto sha1 = sha1Of("hello");
auto crc = crc32Of("hello"); auto crc = crc32Of("hello");
auto string = toHexString(crc); auto string = toHexString(crc);
}
puts("Success!"); puts("Success!");
}
return 0; return 0;
} }

112
win64.mak
View file

@ -43,7 +43,7 @@ DFLAGS=-m$(MODEL) -O -release -w -d -property
## Flags for compiling unittests ## Flags for compiling unittests
UDFLAGS=-m$(MODEL) -O -w -d -property UDFLAGS=-g -m$(MODEL) -O -w -d -property
## C compiler, linker, librarian ## C compiler, linker, librarian
@ -111,13 +111,14 @@ SRC_STD_2_HEAVY= std\range.d
SRC_STD_2a_HEAVY= std\array.d std\functional.d std\path.d std\outbuffer.d std\utf.d SRC_STD_2a_HEAVY= std\array.d std\functional.d std\path.d std\outbuffer.d std\utf.d
SRC_STD_3= std\csv.d std\math.d std\complex.d std\numeric.d std\bigint.d \ SRC_STD_math=std\math.d
std\datetime.d \ SRC_STD_3= std\csv.d std\complex.d std\numeric.d std\bigint.d
std\metastrings.d std\bitmanip.d std\typecons.d \ SRC_STD_3c= std\datetime.d std\metastrings.d std\bitmanip.d std\typecons.d
std\uni.d std\base64.d std\md5.d std\ctype.d std\ascii.d \
SRC_STD_3a= std\uni.d std\base64.d std\md5.d std\ctype.d std\ascii.d \
std\demangle.d std\uri.d std\mmfile.d std\getopt.d std\demangle.d std\uri.d std\mmfile.d std\getopt.d
SRC_STD_3a= std\signals.d std\typetuple.d std\traits.d \ SRC_STD_3b= std\signals.d std\typetuple.d std\traits.d \
std\encoding.d std\xml.d \ std\encoding.d std\xml.d \
std\random.d std\regexp.d \ std\random.d std\regexp.d \
std\exception.d \ std\exception.d \
@ -131,12 +132,20 @@ SRC_STD_4= std\uuid.d $(SRC_STD_DIGEST)
SRC_STD_5_HEAVY= std\algorithm.d SRC_STD_5_HEAVY= std\algorithm.d
SRC_STD_REST= std\variant.d \ SRC_STD_6a=std\variant.d
std\syserror.d std\zlib.d \ SRC_STD_6b=std\syserror.d
std\stream.d std\socket.d std\socketstream.d \ SRC_STD_6c=std\zlib.d
std\perf.d std\container.d std\conv.d \ SRC_STD_6d=std\stream.d
std\zip.d std\cstream.d \ SRC_STD_6e=std\socket.d
std\regex.d \ SRC_STD_6f=std\socketstream.d
SRC_STD_6g=std\perf.d
SRC_STD_6h=std\container.d
SRC_STD_6i=std\conv.d
SRC_STD_6j=std\zip.d
SRC_STD_6k=std\cstream.d
SRC_STD_6l=std\regex.d
SRC_STD_7= \
std\stdint.d \ std\stdint.d \
std\json.d \ std\json.d \
std\parallelism.d \ std\parallelism.d \
@ -144,8 +153,22 @@ SRC_STD_REST= std\variant.d \
std\process.d std\process.d
SRC_STD_ALL= $(SRC_STD_1_HEAVY) $(SRC_STD_2_HEAVY) $(SRC_STD_2a_HEAVY) \ SRC_STD_ALL= $(SRC_STD_1_HEAVY) $(SRC_STD_2_HEAVY) $(SRC_STD_2a_HEAVY) \
$(SRC_STD_3) $(SRC_STD_3a) $(SRC_STD_4) \ $(SRC_STD_math) \
$(SRC_STD_5_HEAVY) $(SRC_STD_REST) $(SRC_STD_3) $(SRC_STD_3a) $(SRC_STD_3b) $(SRC_STD_3c) $(SRC_STD_4) \
$(SRC_STD_5_HEAVY) \
$(SRC_STD_6a) \
$(SRC_STD_6b) \
$(SRC_STD_6c) \
$(SRC_STD_6d) \
$(SRC_STD_6e) \
$(SRC_STD_6f) \
$(SRC_STD_6g) \
$(SRC_STD_6h) \
$(SRC_STD_6i) \
$(SRC_STD_6j) \
$(SRC_STD_6k) \
$(SRC_STD_6l) \
$(SRC_STD_7)
SRC= unittest.d crc32.d index.d SRC= unittest.d crc32.d index.d
@ -362,22 +385,55 @@ $(LIB) : $(SRC_TO_COMPILE) \
$(ZLIB) $(DRUNTIMELIB) $(ZLIB) $(DRUNTIMELIB)
UNITTEST_OBJS= unittest1.obj unittest2.obj unittest2a.obj \ UNITTEST_OBJS= unittest1.obj unittest2.obj unittest2a.obj \
unittest3.obj unittest3a.obj unittest4.obj \ unittestM.obj \
unittest5.obj unittest6.obj unittest7.obj unittest3.obj \
unittest3a.obj \
unittest3b.obj \
unittest3c.obj \
unittest4.obj \
unittest5.obj \
unittest6a.obj \
unittest6b.obj \
unittest6c.obj \
unittest6d.obj \
unittest6e.obj \
unittest6f.obj \
unittest6g.obj \
unittest6h.obj \
unittest6i.obj \
unittest6j.obj \
unittest6k.obj \
unittest6l.obj \
unittest7.obj
unittest : $(LIB) unittest : $(LIB)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest1.obj $(SRC_STD_1_HEAVY) $(DMD) $(UDFLAGS) -c -ofunittest1.obj $(SRC_STD_1_HEAVY)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2.obj $(SRC_STD_2_HEAVY) $(DMD) $(UDFLAGS) -c -ofunittest2.obj $(SRC_STD_2_HEAVY)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2a.obj $(SRC_STD_2a_HEAVY) $(DMD) $(UDFLAGS) -c -ofunittest2a.obj $(SRC_STD_2a_HEAVY)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3.obj $(SRC_STD_3) $(DMD) $(UDFLAGS) -c -ofunittestM.obj $(SRC_STD_math)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3a.obj $(SRC_STD_3a) $(DMD) $(UDFLAGS) -c -ofunittest3.obj $(SRC_STD_3)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest4.obj $(SRC_STD_4) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3a.obj $(SRC_STD_3a)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest5.obj $(SRC_STD_5_HEAVY) $(DMD) $(UDFLAGS) -c -ofunittest3b.obj $(SRC_STD_3b)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest6.obj $(SRC_STD_REST) $(DMD) $(UDFLAGS) -c -ofunittest3c.obj $(SRC_STD_3c)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest7.obj $(SRC_TO_COMPILE_NOT_STD) $(DMD) $(UDFLAGS) -c -ofunittest4.obj $(SRC_STD_4)
$(DMD) $(UDFLAGS) -L/co -unittest unittest.d $(UNITTEST_OBJS) \ $(DMD) $(UDFLAGS) -c -ofunittest5.obj $(SRC_STD_5_HEAVY)
$(ZLIB) $(DRUNTIMELIB) $(DMD) $(UDFLAGS) -c -ofunittest6a.obj $(SRC_STD_6a)
unittest $(DMD) $(UDFLAGS) -c -ofunittest6b.obj $(SRC_STD_6b)
$(DMD) $(UDFLAGS) -c -ofunittest6c.obj $(SRC_STD_6c)
$(DMD) $(UDFLAGS) -c -ofunittest6d.obj $(SRC_STD_6d)
$(DMD) $(UDFLAGS) -c -ofunittest6e.obj $(SRC_STD_6e)
$(DMD) $(UDFLAGS) -c -ofunittest6h.obj $(SRC_STD_6h)
$(DMD) $(UDFLAGS) -c -ofunittest6i.obj $(SRC_STD_6i)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6f.obj $(SRC_STD_6f)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6g.obj $(SRC_STD_6g)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6j.obj $(SRC_STD_6j)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6k.obj $(SRC_STD_6k)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6l.obj $(SRC_STD_6l)
$(DMD) $(UDFLAGS) -c -ofunittest7.obj $(SRC_STD_7)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8.obj $(SRC_TO_COMPILE_NOT_STD)
$(DMD) $(UDFLAGS) -unittest unittest.d $(UNITTEST_OBJS) \
$(ZLIB) $(DRUNTIMELIB)
.\unittest.exe
#unittest : unittest.exe #unittest : unittest.exe
# unittest # unittest