NaCl: Move all browser tests into nacl_irt_test_env

IRT-using nexes are normally built in nacl_irt_test_env, not nacl_env.
All of chrome_browser_tests uses the IRT, so changing these tests to
use nacl_irt_test_env brings chrome_browser_tests into line with the
rest of the NaCl Scons build.

This will let us fix libimc_syscalls to call GC hooks without breaking
linking the nexes in chrome_browser_tests (since some tests there use
libimc_syscalls).

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3253
TEST=nacl_integration + count tests to check we haven't lost any

Review URL: https://codereview.chromium.org/11613012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176224 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 12 deletions

diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index 967bbc9..34ceff2 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -33,12 +33,20 @@ def ExtendFileList(existing, additional):
 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',
@@ -49,16 +57,6 @@ ppapi_scons_files['nonvariant_test_scons_files'] = [
     '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',
diff --git a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons
index 33ed844..4dd2d7a 100644
--- a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons
+++ b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons
@@ -48,7 +48,6 @@ def AddTest(env, test_name, exe_list, parallel=False):
   # Disabled on Valgrind because of multiple nexes.
   # TODO(eugenis): enable when Valgrind learns to autodetect the nexe name
   env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name,
-                         disable_irt_suffix=True,
                          is_broken=env.PPAPIBrowserTesterIsBroken() or
                                    env.Bit('running_on_valgrind') or
   # inbrowser_test_runner_parallel is flaky on 32 bit windows