Replace DRuntimeUnittest with existing CoreUnittest

alexandrumc · alexandrumc · commit 8fc334573bb3 · 2020-01-15T09:26:32.000+02:00
diff --git a/posix.mak b/posix.mak
@@ -88,7 +88,7 @@ else
 	DFLAGS:=$(UDFLAGS) -inline # unittests don't compile with -inline
 endif
 
-UTFLAGS:=-version=CoreUnittest -unittest -checkaction=context -version=DRuntimeUnittest
+UTFLAGS:=-version=CoreUnittest -unittest -checkaction=context
 
 # Set PHOBOS_DFLAGS (for linking against Phobos)
 PHOBOS_PATH=../phobos
diff --git a/src/core/atomic.d b/src/core/atomic.d
@@ -819,7 +819,7 @@ private
 ////////////////////////////////////////////////////////////////////////////////
 
 
-version (DRuntimeUnittest)
+version (CoreUnittest)
 {
     void testXCHG(T)(T val) pure nothrow @nogc @trusted
     in
diff --git a/src/core/internal/array/operations.d b/src/core/internal/array/operations.d
@@ -449,12 +449,12 @@ bool contains(T)(const scope T[] ary, const scope T[] vals...)
 
 // tests
 
-version (DRuntimeUnittest) template TT(T...)
+version (CoreUnittest) template TT(T...)
 {
     alias TT = T;
 }
 
-version (DRuntimeUnittest) template _arrayOp(Args...)
+version (CoreUnittest) template _arrayOp(Args...)
 {
     alias _arrayOp = arrayOp!Args;
 }
diff --git a/src/core/internal/parseoptions.d b/src/core/internal/parseoptions.d
@@ -78,7 +78,7 @@ bool parseOptions(CFG)(ref CFG cfg, string opt)
         static if (is(typeof(__traits(getMember, CFG, "help"))))
             if (name == "help")
             {
-                version (DRuntimeUnittest) {} else
+                version (CoreUnittest) {} else
                 cfg.help();
                 opt = skip!isspace(tail);
                 continue;
@@ -135,7 +135,7 @@ private:
 
 bool optError(const scope char[] msg, const scope char[] name, const(char)[] errName)
 {
-    version (DRuntimeUnittest) if (inUnittest) return false;
+    version (CoreUnittest) if (inUnittest) return false;
 
     fprintf(stderr, "%.*s %.*s option '%.*s'.\n",
             cast(int)msg.length, msg.ptr,
@@ -242,7 +242,7 @@ do
 
 bool parseError(const scope char[] exp, const scope char[] opt, const scope char[] got, const(char)[] errName)
 {
-    version (DRuntimeUnittest) if (inUnittest) return false;
+    version (CoreUnittest) if (inUnittest) return false;
 
     fprintf(stderr, "Expecting %.*s as argument for %.*s option '%.*s', got '%.*s' instead.\n",
             cast(int)exp.length, exp.ptr,
@@ -254,7 +254,7 @@ bool parseError(const scope char[] exp, const scope char[] opt, const scope char
 
 size_t min(size_t a, size_t b) { return a <= b ? a : b; }
 
-version (DRuntimeUnittest) __gshared bool inUnittest;
+version (CoreUnittest) __gshared bool inUnittest;
 
 unittest
 {
diff --git a/src/core/internal/traits.d b/src/core/internal/traits.d
@@ -466,7 +466,7 @@ template staticMap(alias F, T...)
 }
 
 // std.exception.assertCTFEable
-version (DRuntimeUnittest) package(core)
+version (CoreUnittest) package(core)
 void assertCTFEable(alias dg)()
 {
     static assert({ cast(void) dg(); return true; }());
diff --git a/src/core/lifetime.d b/src/core/lifetime.d
@@ -752,7 +752,7 @@ T* emplace(T, Args...)(void[] chunk, auto ref Args args)
     }
 }
 
-version (DRuntimeUnittest)
+version (CoreUnittest)
 {
     //Ambiguity
     private struct __std_conv_S
diff --git a/src/core/sys/windows/basetsd.d b/src/core/sys/windows/basetsd.d
@@ -58,7 +58,7 @@ package mixin template AlignedStr(int alignVal, string name, string memberlist,
     mixin( _alignSpec ~ " struct " ~ name ~" { " ~ _alignSpec ~":"~ memberlist~" }" );
 }
 
-version (DRuntimeUnittest) {
+version (CoreUnittest) {
     private mixin AlignedStr!(16, "_Test_Aligned_Str", q{char a; char b;});
     private mixin AlignedStr!(0, "_Test_NoAligned_Str", q{char a; char b;});
 }
diff --git a/src/core/thread/fiber.d b/src/core/thread/fiber.d
@@ -1594,7 +1594,7 @@ unittest {
     assert( composed.state == Fiber.State.TERM );
 }
 
-version (DRuntimeUnittest)
+version (CoreUnittest)
 {
     class TestFiber : Fiber
     {
diff --git a/src/core/time.d b/src/core/time.d
@@ -117,7 +117,7 @@ ulong mach_absolute_time();
 }
 
 //To verify that an lvalue isn't required.
-version (DRuntimeUnittest) private T copy(T)(T t)
+version (CoreUnittest) private T copy(T)(T t)
 {
     return t;
 }
@@ -3968,7 +3968,7 @@ double _abs(double val) @safe pure nothrow @nogc
 }
 
 
-version (DRuntimeUnittest)
+version (CoreUnittest)
 string doubleToString(double value) @safe pure nothrow
 {
     string result;
@@ -3999,7 +3999,7 @@ unittest
     assert(aStr == "-0.337", aStr);
 }
 
-version (DRuntimeUnittest) const(char)* numToStringz()(long value) @trusted pure nothrow
+version (CoreUnittest) const(char)* numToStringz()(long value) @trusted pure nothrow
 {
     return (signedToTempString(value, 10) ~ "\0").ptr;
 }
@@ -4009,7 +4009,7 @@ import core.internal.traits : AliasSeq;
 
 
 /+ An adjusted copy of std.exception.assertThrown. +/
-version (DRuntimeUnittest) void _assertThrown(T : Throwable = Exception, E)
+version (CoreUnittest) void _assertThrown(T : Throwable = Exception, E)
                                     (lazy E expression,
                                      string msg = null,
                                      string file = __FILE__,
@@ -4104,7 +4104,7 @@ unittest
 }
 
 
-version (DRuntimeUnittest) void assertApprox(D, E)(D actual,
+version (CoreUnittest) void assertApprox(D, E)(D actual,
                                           E lower,
                                           E upper,
                                           string msg = "unittest failure",
@@ -4117,7 +4117,7 @@ version (DRuntimeUnittest) void assertApprox(D, E)(D actual,
         throw new AssertError(msg ~ ": upper: " ~ actual.toString(), __FILE__, line);
 }
 
-version (DRuntimeUnittest) void assertApprox(D, E)(D actual,
+version (CoreUnittest) void assertApprox(D, E)(D actual,
                                           E lower,
                                           E upper,
                                           string msg = "unittest failure",
@@ -4133,7 +4133,7 @@ version (DRuntimeUnittest) void assertApprox(D, E)(D actual,
     }
 }
 
-version (DRuntimeUnittest) void assertApprox(MT)(MT actual,
+version (CoreUnittest) void assertApprox(MT)(MT actual,
                                         MT lower,
                                         MT upper,
                                         string msg = "unittest failure",
@@ -4143,7 +4143,7 @@ version (DRuntimeUnittest) void assertApprox(MT)(MT actual,
     assertApprox(actual._ticks, lower._ticks, upper._ticks, msg, line);
 }
 
-version (DRuntimeUnittest) void assertApprox()(long actual,
+version (CoreUnittest) void assertApprox()(long actual,
                                       long lower,
                                       long upper,
                                       string msg = "unittest failure",
diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
@@ -2423,7 +2423,7 @@ unittest
 }
 
 // cannot define structs inside unit test block, or they become nested structs.
-version (DRuntimeUnittest)
+version (CoreUnittest)
 {
     struct S1
     {
diff --git a/src/rt/util/container/common.d b/src/rt/util/container/common.d
@@ -58,7 +58,7 @@ void initialize(T)(ref T t) if (!is(T == struct))
     t = T.init;
 }
 
-version (DRuntimeUnittest) struct RC()
+version (CoreUnittest) struct RC()
 {
 nothrow:
     this(size_t* cnt) { ++*(_cnt = cnt); }
diff --git a/src/rt/util/container/treap.d b/src/rt/util/container/treap.d
@@ -52,7 +52,7 @@ nothrow:
         return opApplyHelper(root, dg);
     }
 
-    version (DRuntimeUnittest)
+    version (CoreUnittest)
     bool opEquals(E[] elements)
     {
         size_t i;
@@ -72,7 +72,7 @@ nothrow:
         root = null;
     }
 
-    version (DRuntimeUnittest)
+    version (CoreUnittest)
     bool valid()
     {
         return valid(root);
@@ -224,7 +224,7 @@ static:
         return opApplyHelper(node.right, dg);
     }
 
-    version (DRuntimeUnittest)
+    version (CoreUnittest)
     bool valid(Node* node)
     {
         if (!node)
diff --git a/src/rt/util/typeinfo.d b/src/rt/util/typeinfo.d
@@ -104,7 +104,7 @@ if (is(T ==  float) || is(T ==  double) || is(T ==  real) ||
     public alias hashOf = core.internal.hash.hashOf;
 }
 
-version (DRuntimeUnittest)
+version (CoreUnittest)
 {
     alias TypeTuple(T...) = T;
 }
diff --git a/test/allocations/Makefile b/test/allocations/Makefile
@@ -15,7 +15,7 @@ $(ROOT)/%.done: $(ROOT)/%
 	$(NEGATE) $(QUIET)$(TIMELIMIT)$(ROOT)/$* $(RUN_ARGS) 2>&1 1>/dev/null | head -n 1 | grep -qF $(STDERR_EXP)
 	@touch $@
 
-$(ROOT)/unittest_assert: DFLAGS+=-unittest -version=DRuntimeUnittest
+$(ROOT)/unittest_assert: DFLAGS+=-unittest -version=CoreUnittest
 $(ROOT)/%: $(SRC)/%.d
 	$(QUIET)$(DMD) $(DFLAGS) -of$@ $<
 
diff --git a/test/exceptions/Makefile b/test/exceptions/Makefile
@@ -94,7 +94,7 @@ $(ROOT)/refcounted.done: $(ROOT)/refcounted
 	$(QUIET) $<
 	@touch $@
 
-$(ROOT)/unittest_assert: DFLAGS+=-unittest -version=DRuntimeUnittest
+$(ROOT)/unittest_assert: DFLAGS+=-unittest -version=CoreUnittest
 $(ROOT)/line_trace: DFLAGS+=$(LINE_TRACE_DFLAGS)
 $(ROOT)/rt_trap_exceptions_drt: DFLAGS+=-g
 $(ROOT)/assert_fail: DFLAGS+=-checkaction=context
diff --git a/test/gc/Makefile b/test/gc/Makefile
@@ -5,7 +5,7 @@ TESTS := sentinel printf memstomp invariant logging precise precisegc forkgc for
 SRC_GC = ../../src/gc/impl/conservative/gc.d
 SRC = $(SRC_GC) ../../src/rt/lifetime.d
 # ../../src/object.d causes duplicate symbols
-UDFLAGS = $(DFLAGS) -unittest -version=DRuntimeUnittest
+UDFLAGS = $(DFLAGS) -unittest -version=CoreUnittest
 
 .PHONY: all clean
 all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))
diff --git a/test/gc/win64.mak b/test/gc/win64.mak
@@ -6,7 +6,7 @@ DRUNTIMELIB=druntime64.lib
 
 SRC_GC = src/gc/impl/conservative/gc.d
 SRC = $(SRC_GC) src/rt/lifetime.d src/object.d
-UDFLAGS = -m$(MODEL) -g -unittest -version=DRuntimeUnittest -conf= -Isrc -defaultlib=$(DRUNTIMELIB)
+UDFLAGS = -m$(MODEL) -g -unittest -version=CoreUnittest -conf= -Isrc -defaultlib=$(DRUNTIMELIB)
 
 test: sentinel printf memstomp invariant logging precise precisegc recoverfree
 
diff --git a/test/stdcpp/Makefile b/test/stdcpp/Makefile
@@ -63,22 +63,22 @@ $(ROOT)/%_old.done : $(ROOT)/%_old
 # build C++98 tests
 $(ROOT)/%: $(SRC)/%.cpp $(SRC)/%_test.d
 	mkdir -p $(dir $@)
-	$(QUIET)$(DMD) $(DFLAGS) -extern-std=c++98 -main -unittest -version=DRuntimeUnittest -c -of=$(ROOT)/$*_d.o $(SRC)/$*_test.d
+	$(QUIET)$(DMD) $(DFLAGS) -extern-std=c++98 -main -unittest -version=CoreUnittest -c -of=$(ROOT)/$*_d.o $(SRC)/$*_test.d
 	$(QUIET)$(CXX) $(CXXFLAGS_BASE) -std=c++98 -o $@ $< $(ROOT)/$*_d.o $(DRUNTIME) -lpthread
 # build C++11 tests
 $(ROOT)/%_11: $(SRC)/%.cpp $(SRC)/%_test.d
 	mkdir -p $(dir $@)
-	$(QUIET)$(DMD) $(DFLAGS) -extern-std=c++11 -main -unittest -version=DRuntimeUnittest -c -of=$(ROOT)/$*_11_d.o $(SRC)/$*_test.d
+	$(QUIET)$(DMD) $(DFLAGS) -extern-std=c++11 -main -unittest -version=CoreUnittest -c -of=$(ROOT)/$*_11_d.o $(SRC)/$*_test.d
 	$(QUIET)$(CXX) $(CXXFLAGS_BASE) -std=c++11 -o $@ $< $(ROOT)/$*_11_d.o $(DRUNTIME) -lpthread
 # build C++17 tests
 $(ROOT)/%_17: $(SRC)/%.cpp $(SRC)/%_test.d
 	mkdir -p $(dir $@)
-	$(QUIET)$(DMD) $(DFLAGS) -extern-std=c++17 -main -unittest -version=DRuntimeUnittest -c -of=$(ROOT)/$*_17_d.o $(SRC)/$*_test.d
+	$(QUIET)$(DMD) $(DFLAGS) -extern-std=c++17 -main -unittest -version=CoreUnittest -c -of=$(ROOT)/$*_17_d.o $(SRC)/$*_test.d
 	$(QUIET)$(CXX) $(CXXFLAGS_BASE) -std=c++17 -o $@ $< $(ROOT)/$*_17_d.o $(DRUNTIME) -lpthread
 # build libstdc++ _GLIBCXX_USE_CXX11_ABI=0 tests
 $(ROOT)/%_old: $(SRC)/%.cpp $(SRC)/%_test.d
 	mkdir -p $(dir $@)
-	$(QUIET)$(DMD) $(DFLAGS) -version=_GLIBCXX_USE_CXX98_ABI -main -unittest -version=DRuntimeUnittest -c -of=$(ROOT)/$*_old_d.o $(SRC)/$*_test.d
+	$(QUIET)$(DMD) $(DFLAGS) -version=_GLIBCXX_USE_CXX98_ABI -main -unittest -version=CoreUnittest -c -of=$(ROOT)/$*_old_d.o $(SRC)/$*_test.d
 	$(QUIET)$(CXX) $(CXXFLAGS_BASE) -D_GLIBCXX_USE_CXX11_ABI=0 -o $@ $< $(ROOT)/$*_old_d.o $(DRUNTIME) -lpthread
 
 clean:
diff --git a/test/stdcpp/win64.mak b/test/stdcpp/win64.mak
@@ -18,21 +18,21 @@ test: $(TESTS)
 
 $(TESTS):
 	"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MT $(ADD_CFLAGS)
-	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=DRuntimeUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
+	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
 	$@.exe
 	del $@.exe $@.obj $@_cpp.obj
 
 	"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MD $(ADD_CFLAGS)
-	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=DRuntimeUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
+	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
 	$@.exe
 	del $@.exe $@.obj $@_cpp.obj
 
 	"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MTd $(ADD_CFLAGS)
-	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=DRuntimeUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
+	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
 	$@.exe
 	del $@.exe $@.obj $@_cpp.obj
 
 	"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MDd $(ADD_CFLAGS)
-	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=DRuntimeUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
+	"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
 	$@.exe
 	del $@.exe $@.obj $@_cpp.obj
diff --git a/win32.mak b/win32.mak
@@ -17,7 +17,7 @@ DFLAGS=-m$(MODEL) -conf= -O -release -dip1000 -preview=fieldwise -inline -w -Isr
 UDFLAGS=-m$(MODEL) -conf= -O -release -dip1000 -preview=fieldwise -w -Isrc -Iimport
 DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
 
-UTFLAGS=-version=CoreUnittest -unittest -checkaction=context -version=DRuntimeUnittest
+UTFLAGS=-version=CoreUnittest -unittest -checkaction=context
 
 CFLAGS=
 
diff --git a/win64.mak b/win64.mak
@@ -24,7 +24,7 @@ DFLAGS=-m$(MODEL) -conf= -O -release -dip1000 -preview=fieldwise -inline -w -Isr
 UDFLAGS=-m$(MODEL) -conf= -O -release -dip1000 -preview=fieldwise -w -version=_MSC_VER_$(_MSC_VER) -Isrc -Iimport
 DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
 
-UTFLAGS=-version=CoreUnittest -unittest -checkaction=context -version=DRuntimeUnittest
+UTFLAGS=-version=CoreUnittest -unittest -checkaction=context
 
 #CFLAGS=/O2 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
 CFLAGS=/Z7 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include

Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,7 @@ private`
`819`	`819`	`////////////////////////////////////////////////////////////////////////////////`
`820`	`820`
`821`	`821`
`822`		`-version (DRuntimeUnittest)`
	`822`	`+version (CoreUnittest)`
`823`	`823`	`{`
`824`	`824`	`void testXCHG(T)(T val) pure nothrow @nogc @trusted`
`825`	`825`	`in`
Original file line number	Diff line number	Diff line change
`@@ -449,12 +449,12 @@ bool contains(T)(const scope T[] ary, const scope T[] vals...)`
`449`	`449`
`450`	`450`	`// tests`
`451`	`451`
`452`		`-version (DRuntimeUnittest) template TT(T...)`
	`452`	`+version (CoreUnittest) template TT(T...)`
`453`	`453`	`{`
`454`	`454`	`alias TT = T;`
`455`	`455`	`}`
`456`	`456`
`457`		`-version (DRuntimeUnittest) template _arrayOp(Args...)`
	`457`	`+version (CoreUnittest) template _arrayOp(Args...)`
`458`	`458`	`{`
`459`	`459`	`alias _arrayOp = arrayOp!Args;`
`460`	`460`	`}`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ template staticMap(alias F, T...)`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`// std.exception.assertCTFEable`
`469`		`-version (DRuntimeUnittest) package(core)`
	`469`	`+version (CoreUnittest) package(core)`
`470`	`470`	`void assertCTFEable(alias dg)()`
`471`	`471`	`{`
`472`	`472`	`static assert({ cast(void) dg(); return true; }());`
Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ T* emplace(T, Args...)(void[] chunk, auto ref Args args)`
`752`	`752`	`}`
`753`	`753`	`}`
`754`	`754`
`755`		`-version (DRuntimeUnittest)`
	`755`	`+version (CoreUnittest)`
`756`	`756`	`{`
`757`	`757`	`//Ambiguity`
`758`	`758`	`private struct __std_conv_S`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ package mixin template AlignedStr(int alignVal, string name, string memberlist,`
`58`	`58`	`mixin( _alignSpec ~ " struct " ~ name ~" { " ~ _alignSpec ~":"~ memberlist~" }" );`
`59`	`59`	`}`
`60`	`60`
`61`		`-version (DRuntimeUnittest) {`
	`61`	`+version (CoreUnittest) {`
`62`	`62`	`private mixin AlignedStr!(16, "_Test_Aligned_Str", q{char a; char b;});`
`63`	`63`	`private mixin AlignedStr!(0, "_Test_NoAligned_Str", q{char a; char b;});`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1594,7 +1594,7 @@ unittest {`
`1594`	`1594`	`assert( composed.state == Fiber.State.TERM );`
`1595`	`1595`	`}`
`1596`	`1596`
`1597`		`-version (DRuntimeUnittest)`
	`1597`	`+version (CoreUnittest)`
`1598`	`1598`	`{`
`1599`	`1599`	`class TestFiber : Fiber`
`1600`	`1600`	`{`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ ulong mach_absolute_time();`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`//To verify that an lvalue isn't required.`
`120`		`-version (DRuntimeUnittest) private T copy(T)(T t)`
	`120`	`+version (CoreUnittest) private T copy(T)(T t)`
`121`	`121`	`{`
`122`	`122`	`return t;`
`123`	`123`	`}`
`@@ -3968,7 +3968,7 @@ double _abs(double val) @safe pure nothrow @nogc`
`3968`	`3968`	`}`
`3969`	`3969`
`3970`	`3970`
`3971`		`-version (DRuntimeUnittest)`
	`3971`	`+version (CoreUnittest)`
`3972`	`3972`	`string doubleToString(double value) @safe pure nothrow`
`3973`	`3973`	`{`
`3974`	`3974`	`string result;`
`@@ -3999,7 +3999,7 @@ unittest`
`3999`	`3999`	`assert(aStr == "-0.337", aStr);`
`4000`	`4000`	`}`
`4001`	`4001`
`4002`		`-version (DRuntimeUnittest) const(char)* numToStringz()(long value) @trusted pure nothrow`
	`4002`	`+version (CoreUnittest) const(char)* numToStringz()(long value) @trusted pure nothrow`
`4003`	`4003`	`{`
`4004`	`4004`	`return (signedToTempString(value, 10) ~ "\0").ptr;`
`4005`	`4005`	`}`
`@@ -4009,7 +4009,7 @@ import core.internal.traits : AliasSeq;`
`4009`	`4009`
`4010`	`4010`
`4011`	`4011`	`/+ An adjusted copy of std.exception.assertThrown. +/`
`4012`		`-version (DRuntimeUnittest) void _assertThrown(T : Throwable = Exception, E)`
	`4012`	`+version (CoreUnittest) void _assertThrown(T : Throwable = Exception, E)`
`4013`	`4013`	`(lazy E expression,`
`4014`	`4014`	`string msg = null,`
`4015`	`4015`	`string file = __FILE__,`
`@@ -4104,7 +4104,7 @@ unittest`
`4104`	`4104`	`}`
`4105`	`4105`
`4106`	`4106`
`4107`		`-version (DRuntimeUnittest) void assertApprox(D, E)(D actual,`
	`4107`	`+version (CoreUnittest) void assertApprox(D, E)(D actual,`
`4108`	`4108`	`E lower,`
`4109`	`4109`	`E upper,`
`4110`	`4110`	`string msg = "unittest failure",`
`@@ -4117,7 +4117,7 @@ version (DRuntimeUnittest) void assertApprox(D, E)(D actual,`
`4117`	`4117`	`throw new AssertError(msg ~ ": upper: " ~ actual.toString(), __FILE__, line);`
`4118`	`4118`	`}`
`4119`	`4119`
`4120`		`-version (DRuntimeUnittest) void assertApprox(D, E)(D actual,`
	`4120`	`+version (CoreUnittest) void assertApprox(D, E)(D actual,`
`4121`	`4121`	`E lower,`
`4122`	`4122`	`E upper,`
`4123`	`4123`	`string msg = "unittest failure",`
`@@ -4133,7 +4133,7 @@ version (DRuntimeUnittest) void assertApprox(D, E)(D actual,`
`4133`	`4133`	`}`
`4134`	`4134`	`}`
`4135`	`4135`
`4136`		`-version (DRuntimeUnittest) void assertApprox(MT)(MT actual,`
	`4136`	`+version (CoreUnittest) void assertApprox(MT)(MT actual,`
`4137`	`4137`	`MT lower,`
`4138`	`4138`	`MT upper,`
`4139`	`4139`	`string msg = "unittest failure",`
`@@ -4143,7 +4143,7 @@ version (DRuntimeUnittest) void assertApprox(MT)(MT actual,`
`4143`	`4143`	`assertApprox(actual._ticks, lower._ticks, upper._ticks, msg, line);`
`4144`	`4144`	`}`
`4145`	`4145`
`4146`		`-version (DRuntimeUnittest) void assertApprox()(long actual,`
	`4146`	`+version (CoreUnittest) void assertApprox()(long actual,`
`4147`	`4147`	`long lower,`
`4148`	`4148`	`long upper,`
`4149`	`4149`	`string msg = "unittest failure",`
Original file line number	Diff line number	Diff line change
`@@ -2423,7 +2423,7 @@ unittest`
`2423`	`2423`	`}`
`2424`	`2424`
`2425`	`2425`	`// cannot define structs inside unit test block, or they become nested structs.`
`2426`		`-version (DRuntimeUnittest)`
	`2426`	`+version (CoreUnittest)`
`2427`	`2427`	`{`
`2428`	`2428`	`struct S1`
`2429`	`2429`	`{`