Index: /trunk/src/VBox/Runtime/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/testcase/Makefile.kmk (revision 19949) +++ /trunk/src/VBox/Runtime/testcase/Makefile.kmk (revision 19950) @@ -52,5 +52,5 @@ tstRTBase64 \ tstRTBitOperations \ - tstCidr \ + tstRTCidr \ tstCritSect \ tstDeadlock \ @@ -150,5 +150,6 @@ tstRTBitOperationsPIC3_DEFS = PIC -tstCidr_SOURCES = tstCidr.cpp +tstRTCidr_TEMPLATE = VBOXR3TSTEXE +tstRTCidr_SOURCES = tstRTCidr.cpp tstCritSect_SOURCES = tstCritSect.cpp Index: unk/src/VBox/Runtime/testcase/tstCidr.cpp =================================================================== --- /trunk/src/VBox/Runtime/testcase/tstCidr.cpp (revision 19949) +++ (revision ) @@ -1,93 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT Testcase - IPv4. - */ - -/* - * Copyright (C) 2008-2009 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - - -/******************************************************************************* -* Header Files * -*******************************************************************************/ -#include - -#include -#include -#include - - -/******************************************************************************* -* Defined Constants And Macros * -*******************************************************************************/ -#define CHECKNETWORK(String, rcExpected, ExpectedNetwork, ExpectedNetMask) \ - do { \ - RTIPV4ADDR Network, NetMask; \ - int rc = RTCidrStrToIPv4(String, &Network, &NetMask); \ - if ((rcExpected) && !rc) \ - { \ - RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc\n", \ - __LINE__, String, (rcExpected), rc); \ - } \ - else if ( (rcExpected) != rc \ - || ( rc == VINF_SUCCESS \ - && ( (ExpectedNetwork) != Network \ - || (ExpectedNetMask) != NetMask))) \ - { \ - RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc, expected network %08x got %08x, expected netmask %08x got %08x\n", \ - __LINE__, String, rcExpected, rc, (ExpectedNetwork), Network, (ExpectedNetMask), NetMask); \ - } \ - } while (0) - - -int main() -{ - int rc = RTR3Init(); - if (RT_FAILURE(rc)) - return 1; - RTTEST hTest; - rc = RTTestCreate("tstRTCidr", &hTest); - if (RT_FAILURE(rc)) - return 1; - RTTestBanner(hTest); - - CHECKNETWORK("10.0.0/24", VINF_SUCCESS, 0x0A000000, 0xFFFFFF00); - CHECKNETWORK("10.0.0/8", VINF_SUCCESS, 0x0A000000, 0xFF000000); - CHECKNETWORK("10.0.0./24", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("0.1.0/24", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.255.0.0/24", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.1234.0.0/24", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.256.0.0/24", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.0.0/3", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.1.2.3/8", VINF_SUCCESS, 0x0A010203, 0xFF000000); - CHECKNETWORK("10.0.0/29", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.0.0/240", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.0.0/24.", VERR_INVALID_PARAMETER, 0, 0); - CHECKNETWORK("10.1.2/16", VINF_SUCCESS, 0x0A010200, 0xFFFF0000); - CHECKNETWORK("1.2.3.4", VINF_SUCCESS, 0x01020304, 0xFFFFFFFF); - - return RTTestSummaryAndDestroy(hTest); -} - Index: /trunk/src/VBox/Runtime/testcase/tstRTCidr.cpp =================================================================== --- /trunk/src/VBox/Runtime/testcase/tstRTCidr.cpp (revision 19950) +++ /trunk/src/VBox/Runtime/testcase/tstRTCidr.cpp (revision 19950) @@ -0,0 +1,93 @@ +/* $Id$ */ +/** @file + * IPRT Testcase - IPv4. + */ + +/* + * Copyright (C) 2008-2009 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include + +#include +#include +#include + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +#define CHECKNETWORK(String, rcExpected, ExpectedNetwork, ExpectedNetMask) \ + do { \ + RTIPV4ADDR Network, NetMask; \ + int rc = RTCidrStrToIPv4(String, &Network, &NetMask); \ + if ((rcExpected) && !rc) \ + { \ + RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc\n", \ + __LINE__, String, (rcExpected), rc); \ + } \ + else if ( (rcExpected) != rc \ + || ( rc == VINF_SUCCESS \ + && ( (ExpectedNetwork) != Network \ + || (ExpectedNetMask) != NetMask))) \ + { \ + RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc, expected network %08x got %08x, expected netmask %08x got %08x\n", \ + __LINE__, String, rcExpected, rc, (ExpectedNetwork), Network, (ExpectedNetMask), NetMask); \ + } \ + } while (0) + + +int main() +{ + int rc = RTR3Init(); + if (RT_FAILURE(rc)) + return 1; + RTTEST hTest; + rc = RTTestCreate("tstRTCidr", &hTest); + if (RT_FAILURE(rc)) + return 1; + RTTestBanner(hTest); + + CHECKNETWORK("10.0.0/24", VINF_SUCCESS, 0x0A000000, 0xFFFFFF00); + CHECKNETWORK("10.0.0/8", VINF_SUCCESS, 0x0A000000, 0xFF000000); + CHECKNETWORK("10.0.0./24", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("0.1.0/24", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.255.0.0/24", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.1234.0.0/24", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.256.0.0/24", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.0.0/3", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.1.2.3/8", VINF_SUCCESS, 0x0A010203, 0xFF000000); + CHECKNETWORK("10.0.0/29", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.0.0/240", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.0.0/24.", VERR_INVALID_PARAMETER, 0, 0); + CHECKNETWORK("10.1.2/16", VINF_SUCCESS, 0x0A010200, 0xFFFF0000); + CHECKNETWORK("1.2.3.4", VINF_SUCCESS, 0x01020304, 0xFFFFFFFF); + + return RTTestSummaryAndDestroy(hTest); +} +