Pnacl ppapi shim generator (from IDL), based on Noel's first cut.

ppapi/PRESUBMIT.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import sys
 import subprocess
 
+def RunCmdAndCheck(cmd, ppapi_dir, err_string, output_api):
+  results = []
+  p = subprocess.Popen(cmd, cwd=os.path.join(ppapi_dir, 'generators'),
+                       stdout=subprocess.PIPE,
+                       stderr=subprocess.PIPE)
+  (p_stdout, p_stderr) = p.communicate()
+  if p.returncode:
+    results.append(
+        output_api.PresubmitError(err_string,
+                                  long_text=p_stderr))
+  return results
+
+
+def RunUnittests(input_api, output_api):
+  # Run some Generator unittests if the generator source was changed.
+  results = []
+  files = input_api.LocalPaths()
+  generator_files = []
+  for filename in files:
+    name_parts = filename.split(os.sep)
+    if name_parts[0:2] == ['ppapi', 'generators']:
+      generator_files.append(filename)
+  if generator_files != []:
+    cmd = [ sys.executable, 'idl_gen_pnacl.py', '--wnone', '--test']
+    ppapi_dir = input_api.PresubmitLocalPath()
+    results.extend(RunCmdAndCheck(cmd,
+                                  ppapi_dir,
+                                  'PPAPI IDL Pnacl unittest failed.',
+                                  output_api))

[noelallen1, 2011/11/23 18:06:11]

Should add the regular generator to this, but that can be a new CL.

[jvoung - send to chromium..., 2011/11/23 22:39:28]

Do you mean to just run "generator.py" ? I'm not sure how that differs from the
stuff at line 83-88 (except that those are triggered on changes to .h and .idl
while this is triggered on changes to the generator scripts).

[jvoung - send to chromium..., 2011/11/29 21:13:48]

Noel, in a second CL, I can have it run something like line 83-88, but without
limiting the scope to specific .h and .idl files if the generator code changed.

+  return results
+
+
 def CheckChange(input_api, output_api):
   results = []
 
+  results.extend(RunUnittests(input_api, output_api))
+
   # Verify all modified *.idl have a matching *.h
   files = input_api.LocalPaths()
   h_files = []
   idl_files = []
 
   for filename in files:
     name, ext = os.path.splitext(filename)
     name_parts = name.split(os.sep)
     if name_parts[0:2] == ['ppapi', 'c'] and ext == '.h':
       h_files.append('/'.join(name_parts[2:]))
@@ skipping 22 matching lines @@
   # Verify all *.h files match *.idl definitions, use:
   #   --test to prevent output to disk
   #   --diff to generate a unified diff
   #   --out to pick which files to examine (only the ones in the CL)
   ppapi_dir = input_api.PresubmitLocalPath()
   cmd = [ sys.executable, 'generator.py',
           '--wnone', '--diff', '--test','--cgen', '--range=start,end']
 
   # Only generate output for IDL files references (as *.h or *.idl) in this CL
   cmd.append('--out=' + ','.join([name + '.idl' for name in both]))
-
-  p = subprocess.Popen(cmd, cwd=os.path.join(ppapi_dir, 'generators'),
-                       stdout=subprocess.PIPE,
-                       stderr=subprocess.PIPE)
-  (p_stdout, p_stderr) = p.communicate()
-  if p.returncode:
-    results.append(
-        output_api.PresubmitError('PPAPI IDL Diff detected: Run the generator.',
-                                  long_text=p_stderr))
+  results.extend(RunCmdAndCheck(cmd,
+                                ppapi_dir,
+                                'PPAPI IDL Diff detected: Run the generator.',
+                                output_api))
   return results
 
 def CheckChangeOnUpload(input_api, output_api):
 #  return []
   return CheckChange(input_api, output_api)
 
 def CheckChangeOnCommit(input_api, output_api):
 #  return []
   return CheckChange(input_api, output_api)
-