| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 Import('env') | 6 Import('env') |
| 7 | 7 |
| 8 | 8 |
| 9 env.ComponentLibrary('testrunner', ['test_runner.c']) | 9 env.ComponentLibrary('testrunner', ['test_runner.c']) |
| 10 | 10 |
| 11 | |
| 12 if env.Bit('bitcode'): | 11 if env.Bit('bitcode'): |
| 13 # The test is disabled for ARM/PNaCl because dynamic_load_test.nexe | 12 # The test is disabled for ARM/PNaCl because dynamic_load_test.nexe |
| 14 # was disabled for ARM/PNaCl. TODO(mseaborn): Re-enable both. | 13 # was disabled for ARM/PNaCl. TODO(mseaborn): Re-enable both. |
| 15 Return() | 14 Return() |
| 16 | 15 |
| 17 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html') | 16 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html') |
| 18 env.Replicate('$STAGING_DIR', | 17 env.Replicate('$STAGING_DIR', |
| 19 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js') | 18 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js') |
| 20 test_files = [ | 19 test_files = [ |
| 21 env.File('$STAGING_DIR/nacltest.js'), | 20 env.File('$STAGING_DIR/nacltest.js'), |
| 22 env.File('$STAGING_DIR/dynamic_load_test.nmf'), | 21 env.File('$STAGING_DIR/dynamic_load_test.nmf'), |
| 23 env.File('$STAGING_DIR/dynamic_load_test_${TARGET_FULLARCH}${PROGSUFFIX}'), | 22 env.File('$STAGING_DIR/dynamic_load_test_${TARGET_FULLARCH}${PROGSUFFIX}'), |
| 24 env.File('$STAGING_DIR/dynamic_modify_test.nmf'), | 23 env.File('$STAGING_DIR/dynamic_modify_test.nmf'), |
| 25 env.File('$STAGING_DIR/dynamic_modify_test_${TARGET_FULLARCH}${PROGSUFFIX}'), | 24 env.File('$STAGING_DIR/dynamic_modify_test_${TARGET_FULLARCH}${PROGSUFFIX}'), |
| 26 env.File('$STAGING_DIR/imc_shm_mmap_test.nmf'), | 25 env.File('$STAGING_DIR/imc_shm_mmap_test.nmf'), |
| 27 env.File('$STAGING_DIR/imc_shm_mmap_test_${TARGET_FULLARCH}${PROGSUFFIX}'), | 26 env.File('$STAGING_DIR/imc_shm_mmap_test_${TARGET_FULLARCH}${PROGSUFFIX}'), |
| 28 ] | 27 ] |
| 29 | 28 |
| 30 # These are not true dependencies: They are not needed for | 29 # These are not true dependencies: They are not needed for |
| 31 # test_runner.html to be replicated to "staging", but they are needed | 30 # test_runner.html to be replicated to "staging", but they are needed |
| 32 # for test_runner.html to work when run. | 31 # for test_runner.html to work when run. |
| 33 env.Depends(dest_copy, test_files) | 32 env.Depends(dest_copy, test_files) |
| 34 env.Alias('test_runner.html', dest_copy) | 33 env.Alias('test_runner.html', dest_copy) |
| 35 | 34 |
| 36 node = env.PPAPIBrowserTester( | 35 node = env.PPAPIBrowserTester( |
| 37 'inbrowser_test_runner.out', url='test_runner.html', | 36 'inbrowser_test_runner.out', url='test_runner.html', |
| 37 nmfs=[ |
| 38 '${SCONSTRUCT_DIR}/tests/dynamic_code_loading/dynamic_load_test.nmf', |
| 39 '${SCONSTRUCT_DIR}/tests/dynamic_code_loading/dynamic_modify_test.nmf', |
| 40 '${SCONSTRUCT_DIR}/tests/imc_shm_mmap/imc_shm_mmap_test.nmf'], |
| 38 files=[env.File('test_runner.html')] + test_files, | 41 files=[env.File('test_runner.html')] + test_files, |
| 39 args=['--enable_experimental_js']) | 42 args=['--enable_experimental_js']) |
| 40 | 43 |
| 41 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], | 44 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], |
| 42 'run_inbrowser_test_runner', | 45 'run_inbrowser_test_runner', |
| 43 is_flaky=True, # Don't subject Chrome to our problems. | 46 is_flaky=True, # Don't subject Chrome to our problems. |
| 44 is_broken=env.PPAPIBrowserTesterIsBroken()) | 47 is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 48 env.Bit('nacl_glibc')) |
| OLD | NEW |