← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/testcase/tstRTCidr.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/testcase/tstRTCidr.cpp
45
45
#define CHECKNETWORK(String, rcExpected, ExpectedNetwork, ExpectedNetMask) \
46
46
    do { \
47
47
        RTIPV4ADDR Network, NetMask; \
48
 
        int rc = RTCidrStrToIPv4(String, &Network, &NetMask); \
49
 
        if ((rcExpected) && !rc) \
 
48
        int rc2 = RTCidrStrToIPv4(String, &Network, &NetMask); \
 
49
        if ((rcExpected) && !rc2) \
50
50
        { \
51
51
            RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc\n", \
52
 
                          __LINE__, String, (rcExpected), rc); \
 
52
                          __LINE__, String, (rcExpected), rc2); \
53
53
        } \
54
 
        else if (   (rcExpected) != rc \
55
 
                 || (   rc == VINF_SUCCESS \
 
54
        else if (   (rcExpected) != rc2 \
 
55
                 || (   rc2 == VINF_SUCCESS \
56
56
                     && (   (ExpectedNetwork) != Network \
57
57
                         || (ExpectedNetMask) != NetMask))) \
58
58
        { \
59
59
            RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc, expected network %08x got %08x, expected netmask %08x got %08x\n", \
60
 
                          __LINE__, String, rcExpected, rc, (ExpectedNetwork), Network, (ExpectedNetMask), NetMask); \
 
60
                          __LINE__, String, rcExpected, rc2, (ExpectedNetwork), Network, (ExpectedNetMask), NetMask); \
61
61
        } \
62
62
    } while (0)
63
63