| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright 2010 The Native Client Authors. All rights reserved. | 2 # Copyright 2010 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can | 3 # Use of this source code is governed by a BSD-style license that can |
| 4 # be found in the LICENSE file. | 4 # be 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 | 11 |
| 12 if env.Bit('bitcode'): | 12 if env.Bit('bitcode'): |
| 13 # The test is disabled for ARM/PNaCl because dynamic_load_test.nexe | 13 # The test is disabled for ARM/PNaCl because dynamic_load_test.nexe |
| 14 # was disabled for ARM/PNaCl. TODO(mseaborn): Re-enable both. | 14 # was disabled for ARM/PNaCl. TODO(mseaborn): Re-enable both. |
| 15 Return() | 15 Return() |
| 16 | 16 |
| 17 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html') | 17 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html') |
| 18 test_executables = [ | 18 test_executables = [ |
| 19 env.File('$STAGING_DIR/dynamic_load_test.nexe'), | 19 env.File('$STAGING_DIR/dynamic_load_test.nexe'), |
| 20 env.File('$STAGING_DIR/dynamic_modify_test.nexe'), |
| 20 env.File('$STAGING_DIR/imc_shm_mmap_test.nexe'), | 21 env.File('$STAGING_DIR/imc_shm_mmap_test.nexe'), |
| 21 ] | 22 ] |
| 22 # These are not true dependencies: They are not needed for | 23 # These are not true dependencies: They are not needed for |
| 23 # test_runner.html to be replicated to "staging", but they are needed | 24 # test_runner.html to be replicated to "staging", but they are needed |
| 24 # for test_runner.html to work when run. | 25 # for test_runner.html to work when run. |
| 25 env.Depends(dest_copy, test_executables) | 26 env.Depends(dest_copy, test_executables) |
| 26 env.Alias('test_runner.html', dest_copy) | 27 env.Alias('test_runner.html', dest_copy) |
| 27 | 28 |
| 28 node = env.BrowserTester( | 29 node = env.BrowserTester( |
| 29 'my_browser_test.out', url='test_runner.html', | 30 'my_browser_test.out', url='test_runner.html', |
| 30 files=[env.File('test_runner.html')] + test_executables, | 31 files=[env.File('test_runner.html')] + test_executables, |
| 31 ) | 32 ) |
| 32 # Disabling test on mac, see: | 33 # Disabling test on mac, see: |
| 33 # http://code.google.com/p/nativeclient/issues/detail?id=1170 | 34 # http://code.google.com/p/nativeclient/issues/detail?id=1170 |
| 34 if 'TRUSTED_ENV' in env and not env['TRUSTED_ENV'].Bit('mac'): | 35 if 'TRUSTED_ENV' in env and not env['TRUSTED_ENV'].Bit('mac'): |
| 35 env.AddNodeToTestSuite(node, ['browser_tests'], 'run_inbrowser_test_runner') | 36 env.AddNodeToTestSuite(node, ['browser_tests'], 'run_inbrowser_test_runner') |
| OLD | NEW |