Extend and improve tests for llvm 3.9

Author: iMichka

unittests/test_va_list_tag_removal.py

@@ -29,6 +29,9 @@ def __init__(self, *args):
             "__int128_t", "__uint128_t", "__builtin_va_list"]
         self.known_typedefs_llvm39 = \
             self.known_typedefs + ["__builtin_ms_va_list"]
+        self.known_classes = ["a", "__va_list_tag"]
+        self.known_classes_llvm39 = \
+            self.known_classes + ["__NSConstantString_tag"]
 
     def test_keep_va_list_tag(self):
 
@@ -52,10 +55,16 @@ def test_keep_va_list_tag(self):
 
         self.assertTrue(tag in [class_.name for class_ in classes])
         self.assertTrue("a" in [class_.name for class_ in classes])
-        self.assertTrue(len(classes) == 2)
-
-        self.assertTrue(len(typedefs) == 4)
-        if tag not in [ty.name for ty in typedefs]:
+        if len(classes) == 2:
+            for c in self.known_classes:
+                self.assertTrue(c in [cl.name for cl in classes])
+        elif len(classes) == 3:
+            for c in self.known_classes_llvm39:
+                # This is for llvm 3.9
+                self.assertTrue(c in [cl.name for cl in classes])
+
+        self.assertTrue(len(typedefs) == 4 or len(typedefs) == 5)
+        if len(typedefs) == 5:
             # This is for llvm 3.9. The class __va_list_tag struct is still
             # there but the typedef is gone
             for t in self.known_typedefs_llvm39:
@@ -71,7 +80,10 @@ def test_keep_va_list_tag(self):
 
         self.assertTrue(
             tag in [var.decl_string.split("::")[1] for var in variables])
-        self.assertTrue(len(variables) == 4)
+
+        # 4 variables in __va_list_tag, and 4 more in __NSConstantString_tag
+        # for llvm 3.9
+        self.assertTrue(len(variables) == 4 or len(variables) == 8)
 
     def test_remove_va_list_tag(self):