bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4160 to 4161)

[Dyre Tjeldvoll]

 4161 Dyre Tjeldvoll	2013-01-15
      Exclude tests that assumes port 22 is in use if sshd is not running on localhost

    modified:
      storage/ndb/mcc/tst/tst_main.py
 4160 Dyre Tjeldvoll	2013-01-15
      Cannot test env vars directly with if in cmake

    modified:
      storage/ndb/mcc/CMakeLists.txt
=== modified file 'storage/ndb/mcc/tst/tst_main.py'
--- a/storage/ndb/mcc/tst/tst_main.py	2013-01-15 09:28:10 +0000
+++ b/storage/ndb/mcc/tst/tst_main.py	2013-01-15 14:05:55 +0000
@@ -118,7 +118,8 @@ class Test00Utils(utmod.TestCase):
 
     def test_host_is_unreachable(self):
         self.assertTrue(host_is_unreachable('some_non_existent_host_name'))
-    
+
+    @utmod.skipIf(not is_local_sshd_available(), 'FIXME: Sshd is not running by default on Windows - test some other port?')
     def test_host_is_unreachable(self):
         self.assertFalse(host_is_unreachable('localhost'))
 
@@ -158,7 +159,7 @@ class Test0ConfigIni(utmod.TestCase):
     def test_ndb_config(self):
         print 'ndb config as json: ', json.dumps(util.xml_to_python(self.cluster.ndb_config_xml())) 
         
-                                           
+@stripped(not is_local_sshd_available(), 'FIXME: Sshd is not running by default on Windows - test some other port?')
 class Test3Ports(utmod.TestCase):
     def testPortNotAvailable(self):
         self.assertFalse(util.is_port_available('localhost', 22))

No bundle (reason: useless for push emails).