NaCl: Move all browser tests into nacl_irt_test_env

ppapi/native_client/chrome_main.scons

 #! -*- python -*-
 # Copyright (c) 2012 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.
 
 import json
 import os
 import shutil
 import sys
 
@@ skipping 15 matching lines @@
   for file_name in existing + additional:
     if file_name in combined:
       print 'WARNING: two references to file %s in the build.' % file_name
     combined.add(file_name)
   return sorted(combined)
 
 
 ppapi_scons_files = {}
 ppapi_scons_files['trusted_scons_files'] = []
 ppapi_scons_files['untrusted_irt_scons_files'] = []
+ppapi_scons_files['nonvariant_test_scons_files'] = []
 
-ppapi_scons_files['nonvariant_test_scons_files'] = [
+ppapi_scons_files['irt_variant_test_scons_files'] = [
     'tests/breakpad_crash_test/nacl.scons',
     'tests/nacl_browser/browser_dynamic_library/nacl.scons',
+    # 'inbrowser_test_runner' must be in the irt_variant list
+    # otherwise it will run no tests.
+    'tests/nacl_browser/inbrowser_test_runner/nacl.scons',
+    # Disabled by Brad Chen 4 Sep to try to green Chromium
+    # nacl_integration tests
+    #'tests/nacl_browser/fault_injection/nacl.scons',
     'tests/nacl_browser/manifest_file/nacl.scons',
     'tests/nacl_browser/nameservice/nacl.scons',
+    'tests/nacl_browser/pnacl_client_translator/nacl.scons',
     'tests/nacl_browser/postmessage_redir/nacl.scons',
     'tests/ppapi_browser/bad/nacl.scons',
     'tests/ppapi_browser/crash/nacl.scons',
     'tests/ppapi_browser/extension_mime_handler/nacl.scons',
     'tests/ppapi_browser/manifest/nacl.scons',
     'tests/ppapi_browser/ppb_instance/nacl.scons',
     'tests/ppapi_browser/ppp_instance/nacl.scons',
     'tests/ppapi_test_lib/nacl.scons',
 ]
 
-ppapi_scons_files['irt_variant_test_scons_files'] = [
-    # 'inbrowser_test_runner' must be in the irt_variant list
-    # otherwise it will run no tests.
-    'tests/nacl_browser/inbrowser_test_runner/nacl.scons',
-    # Disabled by Brad Chen 4 Sep to try to green Chromium
-    # nacl_integration tests
-    #'tests/nacl_browser/fault_injection/nacl.scons',
-    'tests/nacl_browser/pnacl_client_translator/nacl.scons',
-]
-
 ppapi_scons_files['untrusted_scons_files'] = [
     'src/shared/ppapi/nacl.scons',
     'src/untrusted/irt_stub/nacl.scons',
     'src/untrusted/nacl_ppapi_util/nacl.scons',
     'src/untrusted/pnacl_irt_shim/nacl.scons',
     'src/untrusted/pnacl_support_extension/nacl.scons',
 ]
 
 
 EXTRA_ENV = ['XAUTHORITY', 'HOME', 'DISPLAY', 'SSH_TTY', 'KRB5CCNAME']
@@ skipping 564 matching lines @@
 
 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken)
 
 
 def AddChromeFilesFromGroup(env, file_group):
   env['BUILD_SCONSCRIPTS'] = ExtendFileList(
       env.get('BUILD_SCONSCRIPTS', []),
       ppapi_scons_files[file_group])
 
 pre_base_env.AddMethod(AddChromeFilesFromGroup)