From 0315098375ba34aa6d714b2971f9a88de8caf027 Mon Sep 17 00:00:00 2001 From: Casper Hornstrup Date: Sat, 20 Nov 2004 17:56:23 +0000 Subject: [PATCH] 2004-11-20 Casper S. Hornstrup * drivers/net/tcpip/tests/tests/ipreceive.c (RunTest): Switch parameters to _AssertEqualValue. * drivers/net/tcpip/tests/stubs.tst: Add missing stubs. * lib/ws2_32/tests/stubs.tst: Ditto. * ntoskrnl/tests/stubs.tst: Ditto. * regtests/shared/regtests.h: Use unsigned format specifiers. svn path=/trunk/; revision=11717 --- reactos/ChangeLog | 18 ++++++++++++++++++ reactos/drivers/net/tcpip/tests/stubs.tst | 2 ++ .../drivers/net/tcpip/tests/tests/ipreceive.c | 2 +- reactos/lib/ws2_32/tests/stubs.tst | 1 + reactos/ntoskrnl/tests/stubs.tst | 1 + reactos/regtests/shared/regtests.h | 4 ++-- 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 82bde5b91ed..3a6b21fd3dd 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -1,3 +1,21 @@ +2004-11-20 Casper S. Hornstrup + + * drivers/net/tcpip/tests/tests/ipreceive.c (RunTest): Switch parameters + to _AssertEqualValue. + * drivers/net/tcpip/tests/stubs.tst: Add missing stubs. + * lib/ws2_32/tests/stubs.tst: Ditto. + * ntoskrnl/tests/stubs.tst: Ditto. + * regtests/shared/regtests.h: Use unsigned format specifiers. + +2004-11-20 Casper S. Hornstrup + + * config (SEH): Remove. + * regtests/shared/regtests.c (_alloca): Remove; Use from malloca.h + instead. + (PerformTest): Use PSEH to catch exceptions while running tests. + * tools/config.mk (CONFIG): Don't add SEH. + * tools/helper.mk: Link tests with pseh.a. + 2004-11-16 Casper S. Hornstrup * drivers/lib/ip/network/arp.c: Assert certain conditions. diff --git a/reactos/drivers/net/tcpip/tests/stubs.tst b/reactos/drivers/net/tcpip/tests/stubs.tst index cfcb69a8ac8..2e33ee2d075 100644 --- a/reactos/drivers/net/tcpip/tests/stubs.tst +++ b/reactos/drivers/net/tcpip/tests/stubs.tst @@ -48,3 +48,5 @@ ntoskrnl.a _imp__KeSetEvent@12 ntoskrnl.a _imp__IoAcquireCancelSpinLock@4 ntoskrnl.a _imp__KeInitializeEvent@12 ntoskrnl.a _imp__ExAllocatePool@8 +ntoskrnl.a _imp_@ExAcquireFastMutex@4 +ntoskrnl.a _imp_@ExReleaseFastMutex@4 diff --git a/reactos/drivers/net/tcpip/tests/tests/ipreceive.c b/reactos/drivers/net/tcpip/tests/tests/ipreceive.c index 1a3460cc324..2ba1b802f68 100644 --- a/reactos/drivers/net/tcpip/tests/tests/ipreceive.c +++ b/reactos/drivers/net/tcpip/tests/tests/ipreceive.c @@ -27,7 +27,7 @@ static void RunTest() { IPPacket.TotalSize = Packets[i].size; IPReceive( &IF, &IPPacket ); } - _AssertEqualValue(Status,STATUS_SUCCESS); + _AssertEqualValue(STATUS_SUCCESS, Status); } _Dispatcher(IpreceiveTest, "IPReceive"); diff --git a/reactos/lib/ws2_32/tests/stubs.tst b/reactos/lib/ws2_32/tests/stubs.tst index ad1a40d17c6..d94069db53e 100644 --- a/reactos/lib/ws2_32/tests/stubs.tst +++ b/reactos/lib/ws2_32/tests/stubs.tst @@ -14,5 +14,6 @@ kernel32.dll LoadLibraryW@4 kernel32.dll lstrcpyA@8 ntdll.dll ResetEvent@4 ntdll.dll SetEvent@4 +kernel32.dll Sleep@4 ntdll.dll WaitForMultipleObjectsEx@20 kernel32.dll CloseHandle@4 diff --git a/reactos/ntoskrnl/tests/stubs.tst b/reactos/ntoskrnl/tests/stubs.tst index 199d3205385..76d22e82a45 100644 --- a/reactos/ntoskrnl/tests/stubs.tst +++ b/reactos/ntoskrnl/tests/stubs.tst @@ -23,6 +23,7 @@ hal.dll HalQueryRealTimeClock@4 hal.dll HalReadDmaCounter@4 hal.dll HalReleaseDisplayOwnership@0 hal.dll HalReportResourceUsage@0 +hal.dll HalRequestIpi@4 hal.dll @HalRequestSoftwareInterrupt@4 hal.dll HalReturnToFirmware@4 hal.dll HalSetEnvironmentVariable@8 diff --git a/reactos/regtests/shared/regtests.h b/reactos/regtests/shared/regtests.h index 8d56f87c5b3..eea2aa8285e 100755 --- a/reactos/regtests/shared/regtests.h +++ b/reactos/regtests/shared/regtests.h @@ -83,7 +83,7 @@ AppendAssertion(char *message) if ((__Expected) != (__Actual)) \ { \ char _message[100]; \ - sprintf(_message, "Expected %d/0x%.08x was %d/0x%.08x at %s:%d", \ + sprintf(_message, "Expected %ld/0x%.08lx was %ld/0x%.08lx at %s:%d", \ (__Expected), (__Expected), (__Actual), (__Actual), __FILE__, __LINE__); \ AppendAssertion(_message); \ } \ @@ -109,7 +109,7 @@ AppendAssertion(char *message) if ((__Expected) == (__Actual)) \ { \ char _message[100]; \ - sprintf(_message, "Actual value expected to be different from %d/0x%.08x at %s:%d", \ + sprintf(_message, "Actual value expected to be different from %ld/0x%.08lx at %s:%d", \ (__Expected), (__Expected), __FILE__, __LINE__); \ AppendAssertion(_message); \ } \ -- 2.17.1