Add pnacl-gcc generated code back into the callingconv test mix

tests/callingconv/generate.py

 #!/usr/bin/python2.6
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 LICENSE = (
   "/*",
   " * Copyright (c) 2011 The Native Client Authors. All rights reserved.",
   " * Use of this source code is governed by a BSD-style license that can be",
   " * found in the LICENSE file.",
@@ skipping 300 matching lines @@
   lines.append(line)
   return lines
 
 def GenerateTest(settings):
   random.seed(settings.seed)
 
   functions = [ TestFunction(settings, i)
                 for i in xrange(settings.num_functions) ]
 
   calls = [ ]
+  callcount = 0
   for f in functions:
-    calls += [ TestCall(settings, i, f)
-               for i in xrange(settings.calls_per_func) ]
+    for i in xrange(settings.calls_per_func):
+      calls.append(TestCall(settings, callcount, f))
+      callcount += 1
 
   num_asserts = sum([ c.num_asserts for c in calls ])
   return (functions, calls, num_asserts)
 
 
 class TestCall(object):
-  def __init__(self, settings, test_id, function):
+  def __init__(self, settings, call_id, function):
     self.settings = settings
-    self.id = test_id
+    self.id = call_id
     self.f = function
 
     self.num_var_args = random.randint(0, self.settings.max_args_per_func -
                                           self.f.num_fixed_args)
 
     # Generate argument inputs
     self.num_args = self.f.num_fixed_args + self.num_var_args
     args = []
     fmtstr = ''
     for i in xrange(self.num_args):
@@ skipping 198 matching lines @@
   i = make_int()
   j = make_char()
   k = make_short()
   l = make_char()
   m = make_char()
   return "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" % \
          (a,b,c,d,e,f,g,h,i,j,k,l,m)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))