Changeset 684

Timestamp:

05/03/08 04:53:49 (5 months ago)

Author:

walter

Message:

corrected unit tests for Windows

Files:

• trunk/phobos/internal/gc/linux.mak (modified) (1 diff)
• trunk/phobos/internal/gc/win32.mak (modified) (1 diff)
• trunk/phobos/std/stdio.d (modified) (4 diffs)
• trunk/phobos/win32.mak (modified) (6 diffs)

trunk/phobos/internal/gc/linux.mak

@@ -22 +22 @@
-targets : testgc dmgc.a
-
-$(OBJS)
-gc.o gcx.o gcbits.o gclinux.o
+dmgc.a
+dmgc.a
-
-testgc.o : testgc.d
-    $(DMD) -c $(DFLAGS) testgc.d
-
-
-
+
+
+
+
+
-
-gc.o : gc.d

trunk/phobos/internal/gc/win32.mak

@@ -36 +36 @@
-SRC= gc.d gcold.d gcx.d gcbits.d win32.d gclinux.d testgc.d win32.mak linux.mak
-
-
-
-
+
+
+
+
+
+
-
-gc.obj : gc.d

trunk/phobos/std/stdio.d

@@ -296 +296 @@
-    writeln(f, "Hello, ",  "world number ", 42, "!");
-    fclose(f) == 0 || assert(false);
+  version (Windows)
+    assert(cast(char[]) std.file.read(file) == "Hello, world number 42!\r\n");
+  else
-    assert(cast(char[]) std.file.read(file) == "Hello, world number 42!\n");
-    // test writeln on stdout
@@ -304 +307 @@
-    writeln("Hello, ",  "world number ", 42, "!");
-    fclose(stdout) == 0 || assert(false);
+  version (Windows)
+    assert(cast(char[]) std.file.read(file) == "Hello, world number 42!\r\n");
+  else
-    assert(cast(char[]) std.file.read(file) == "Hello, world number 42!\n");
-}
@@ -417 +423 @@
-    writefln(f, "Hello, %s world number %s!", "nice", 42);
-    fclose(f) == 0 || assert(false);
+  version (Windows)
+    assert(cast(char[]) std.file.read(file) == "Hello, nice world number 42!\r\n");
+  else
-    assert(cast(char[]) std.file.read(file) == "Hello, nice world number 42!\n");
-    // test write on stdout
@@ -432 +441 @@
-    fclose(stdout) == 0 || assert(false);
-    auto read = cast(char[]) std.file.read(file);
+  version (Windows)
+    assert(read == "Hello, nice world number 42!\r\n1\r\n1\r\n1\r\n", read);
+  else
-    assert(read == "Hello, nice world number 42!\n1\n1\n1\n", read);
-}

trunk/phobos/win32.mak

@@ -48 +48 @@
-targets : unittest gcstub.obj
-
-unittest : unittest.exe
-    unittest
-
-test : test.exe
-
@@ -59 +56 @@
-    $(DMD) test.obj -g -L/map
-
-
-
-
-
-
+
-    critical.obj object.obj monitor.obj arraycat.obj invariant.obj \
-    dmain2.obj outofmemory.obj aaA.obj adi.obj aApply.obj file.obj \
-    compiler.obj system.obj moduleinit.obj md5.obj base64.obj \
-math.obj 
+
-    outbuffer.obj ctype.obj regexp.obj random.obj windows.obj stat.obj \
-    stream.obj switcherr.obj com.obj array.obj mmfile.obj \
@@ -73 +66 @@
-    iunknown.obj crc32.obj conv.obj arraycast.obj utf.obj uri.obj \
-    Czlib.obj Dzlib.obj zip.obj process.obj registry.obj \
-stdio.obj 
+
-    perf.obj openrj.obj uni.obj winsock.obj oldsyserror.obj \
-    errno.obj boxer.obj cstream.obj charset.obj metastrings.obj \
@@ -95 +88 @@
-
-#   ti_bit.obj ti_Abit.obj
+
+SRCS= std\math.d std\stdio.d
-
-DOCS=   $(DOC)\std_path.html $(DOC)\std_math.html $(DOC)\std_outbuffer.html \
@@ -271 +266 @@
-    internal\gc\linux.mak
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-html : $(DOCS)
@@ -318 +326 @@
-    $(DMD) -c $(DFLAGS) internal\cast.d
-
-
-
+i
+ -oicomplex.obj
-
-critical.obj : internal\critical.c