| OLD | NEW |
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 'core/cross/state_set_test.cc', | 210 'core/cross/state_set_test.cc', |
| 211 'core/cross/state_test.cc', | 211 'core/cross/state_test.cc', |
| 212 'core/cross/stream_bank_test.cc', | 212 'core/cross/stream_bank_test.cc', |
| 213 'core/cross/stream_test.cc', | 213 'core/cross/stream_test.cc', |
| 214 'core/cross/transform_test.cc', | 214 'core/cross/transform_test.cc', |
| 215 'core/cross/tree_traversal_test.cc', | 215 'core/cross/tree_traversal_test.cc', |
| 216 'core/cross/vector_map_test.cc', | 216 'core/cross/vector_map_test.cc', |
| 217 'core/cross/vertex_source_test.cc', | 217 'core/cross/vertex_source_test.cc', |
| 218 'core/cross/visitor_base_test.cc', | 218 'core/cross/visitor_base_test.cc', |
| 219 'core/cross/weak_ptr_test.cc', | 219 'core/cross/weak_ptr_test.cc', |
| 220 'import/cross/destination_buffer_test.cc', |
| 220 'import/cross/gz_compressor_test.cc', | 221 'import/cross/gz_compressor_test.cc', |
| 221 'import/cross/gz_decompressor_test.cc', | 222 'import/cross/gz_decompressor_test.cc', |
| 222 'import/cross/memory_buffer_test.cc', | 223 'import/cross/memory_buffer_test.cc', |
| 223 'import/cross/memory_stream_test.cc', | 224 'import/cross/memory_stream_test.cc', |
| 224 'import/cross/raw_data_test.cc', | 225 'import/cross/raw_data_test.cc', |
| 225 'import/cross/tar_generator_test.cc', | 226 'import/cross/tar_generator_test.cc', |
| 226 'import/cross/tar_processor_test.cc', | 227 'import/cross/tar_processor_test.cc', |
| 227 'import/cross/targz_generator_test.cc', | 228 'import/cross/targz_generator_test.cc', |
| 228 'import/cross/targz_processor_test.cc', | 229 'import/cross/targz_processor_test.cc', |
| 229 'serializer/cross/serializer_test.cc', | 230 'serializer/cross/serializer_test.cc', |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 'testing_framework_hardware.PIXExp', | 452 'testing_framework_hardware.PIXExp', |
| 452 'package_tests.bat', | 453 'package_tests.bat', |
| 453 ]) | 454 ]) |
| 454 system_tests_req += pix_requirements | 455 system_tests_req += pix_requirements |
| 455 | 456 |
| 456 if installed_pdiff: | 457 if installed_pdiff: |
| 457 system_tests_req += installed_pdiff | 458 system_tests_req += installed_pdiff |
| 458 | 459 |
| 459 # Also require gl related libraries based on variant. | 460 # Also require gl related libraries based on variant. |
| 460 system_tests_req += gl_requirements | 461 system_tests_req += gl_requirements |
| 461 | 462 |
| 462 # Require SwiftShader (only if it is available). | 463 # Require SwiftShader (only if it is available). |
| 463 system_tests_req += swiftshader_install | 464 system_tests_req += swiftshader_install |
| 464 | 465 |
| 465 # Add requirements for system_tests. | 466 # Add requirements for system_tests. |
| 466 env.Requires(system_tests_install, system_tests_req) | 467 env.Requires(system_tests_install, system_tests_req) |
| 467 | 468 |
| 468 # Get command line flags for tests driver. | 469 # Get command line flags for tests driver. |
| 469 if int(ARGUMENTS.get('hardware', 1)): | 470 if int(ARGUMENTS.get('hardware', 1)): |
| 470 env.Replace(TEST_DRIVER_FLAGS = '-hardware') | 471 env.Replace(TEST_DRIVER_FLAGS = '-hardware') |
| 471 | 472 |
| 472 # Create an alias for the execution of the system tests. | 473 # Create an alias for the execution of the system tests. |
| 473 env.Alias('system_tests') | 474 env.Alias('system_tests') |
| 474 # Only add actual step if d3d mode (for now). | 475 # Only add actual step if d3d mode (for now). |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 # the plugin in a system directory which could be bad on | 536 # the plugin in a system directory which could be bad on |
| 536 # auto-build machines, etc. | 537 # auto-build machines, etc. |
| 537 plugin_path = '$ARTIFACTS_DIR/${LIBPREFIX}npo3dautoplugin$SHLIBSUFFIX' | 538 plugin_path = '$ARTIFACTS_DIR/${LIBPREFIX}npo3dautoplugin$SHLIBSUFFIX' |
| 538 browser_path = '' | 539 browser_path = '' |
| 539 plugin_install_steps = [] | 540 plugin_install_steps = [] |
| 540 cleanup_steps = [] | 541 cleanup_steps = [] |
| 541 selenium_good_to_go = True | 542 selenium_good_to_go = True |
| 542 | 543 |
| 543 if run_env.Bit('mac'): | 544 if run_env.Bit('mac'): |
| 544 plugin_path = '$ARTIFACTS_DIR/O3D.plugin' | 545 plugin_path = '$ARTIFACTS_DIR/O3D.plugin' |
| 545 | 546 |
| 546 if run_env['MAC_HERMETIC_FIREFOX_DIR']: | 547 if run_env['MAC_HERMETIC_FIREFOX_DIR']: |
| 547 # if we have a hermetic version of Firefox, then run it | 548 # if we have a hermetic version of Firefox, then run it |
| 548 if os.path.exists(run_env.subst('$MAC_HERMETIC_FIREFOX_DIR')): | 549 if os.path.exists(run_env.subst('$MAC_HERMETIC_FIREFOX_DIR')): |
| 549 run_env['MAC_FIREFOX_DIR'] = '$MAC_HERMETIC_FIREFOX_DIR' | 550 run_env['MAC_FIREFOX_DIR'] = '$MAC_HERMETIC_FIREFOX_DIR' |
| 550 run_env['MAC_FIREFOX_APP'] = '$MAC_FIREFOX_DIR/Firefox.app' | 551 run_env['MAC_FIREFOX_APP'] = '$MAC_FIREFOX_DIR/Firefox.app' |
| 551 run_env['MAC_FIREFOX_TGZ'] = '$MAC_FIREFOX_DIR/firefox.tgz' | 552 run_env['MAC_FIREFOX_TGZ'] = '$MAC_FIREFOX_DIR/firefox.tgz' |
| 552 browser_path = '$MAC_FIREFOX_APP/Contents/MacOS/firefox-bin' | 553 browser_path = '$MAC_FIREFOX_APP/Contents/MacOS/firefox-bin' |
| 553 plugin_install_steps = [ | 554 plugin_install_steps = [ |
| 554 'rm -rf "$MAC_FIREFOX_APP"', | 555 'rm -rf "$MAC_FIREFOX_APP"', |
| 555 'cd $MAC_FIREFOX_DIR && tar xfz "$MAC_FIREFOX_TGZ"', | 556 'cd $MAC_FIREFOX_DIR && tar xfz "$MAC_FIREFOX_TGZ"', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 572 plugin_install_steps = [ | 573 plugin_install_steps = [ |
| 573 # copy user's version of Firefox into $MAC_FIREFOX_DIR | 574 # copy user's version of Firefox into $MAC_FIREFOX_DIR |
| 574 'rm -rf "$MAC_FIREFOX_DIR"', | 575 'rm -rf "$MAC_FIREFOX_DIR"', |
| 575 'mkdir "$MAC_FIREFOX_DIR"', | 576 'mkdir "$MAC_FIREFOX_DIR"', |
| 576 'ditto "$MAC_FIREFOX_ORIG_APP" "$MAC_FIREFOX_APP"', | 577 'ditto "$MAC_FIREFOX_ORIG_APP" "$MAC_FIREFOX_APP"', |
| 577 'ln -fs "' + plugin_path + '" "$MAC_FIREFOX_APP/Contents/MacOS/plugi
ns"', | 578 'ln -fs "' + plugin_path + '" "$MAC_FIREFOX_APP/Contents/MacOS/plugi
ns"', |
| 578 ] | 579 ] |
| 579 cleanup_steps = [ | 580 cleanup_steps = [ |
| 580 'rm -rf "$MAC_FIREFOX_DIR"', | 581 'rm -rf "$MAC_FIREFOX_DIR"', |
| 581 ] | 582 ] |
| 582 | 583 |
| 583 | 584 |
| 584 def DeferSelenium(env): | 585 def DeferSelenium(env): |
| 585 if not selenium_good_to_go: | 586 if not selenium_good_to_go: |
| 586 run_selenium_firefox = run_env.Alias( | 587 run_selenium_firefox = run_env.Alias( |
| 587 'selenium_firefox', [], | 588 'selenium_firefox', [], |
| 588 'echo "******* Firefox.app MUST be installed in /Applications!!!"' | 589 'echo "******* Firefox.app MUST be installed in /Applications!!!"' |
| 589 ) | 590 ) |
| 590 else: | 591 else: |
| 591 run_selenium_firefox = run_env.Alias( | 592 run_selenium_firefox = run_env.Alias( |
| 592 'selenium_firefox', | 593 'selenium_firefox', |
| 593 [plugin_path, env.GetPublished('samples', 'asset_files')], | 594 [plugin_path, env.GetPublished('samples', 'asset_files')], |
| 594 # TODO: have a cleaner way to do this. | 595 # TODO: have a cleaner way to do this. |
| 595 [Delete('$ARTIFACTS_DIR/selenium/screenshots_firefox'), | 596 [Delete('$ARTIFACTS_DIR/selenium/screenshots_firefox'), |
| 596 Mkdir('$ARTIFACTS_DIR/selenium/screenshots_firefox')] + | 597 Mkdir('$ARTIFACTS_DIR/selenium/screenshots_firefox')] + |
| 597 plugin_install_steps + | 598 plugin_install_steps + |
| 598 [run_env.Python([ | 599 [run_env.Python([ |
| 599 'tests/selenium/main.py', | 600 'tests/selenium/main.py', |
| 600 '$SELENIUM_FLAGS', | 601 '$SELENIUM_FLAGS', |
| 601 '--browser=*firefox', | 602 '--browser=*firefox', |
| 602 '--browserpath="' + browser_path + '"', | 603 '--browserpath="' + browser_path + '"', |
| 603 '--referencedir=$TEST_REFERENCE_IMAGES', | 604 '--referencedir=$TEST_REFERENCE_IMAGES', |
| 604 '--screenshotsdir=$ARTIFACTS_DIR/selenium/screenshots_firefox'])] + | 605 '--screenshotsdir=$ARTIFACTS_DIR/selenium/screenshots_firefox'])] + |
| 605 cleanup_steps, | 606 cleanup_steps, |
| 606 ) | 607 ) |
| 607 | 608 |
| 608 # Require SwiftShader (only if it is available). | 609 # Require SwiftShader (only if it is available). |
| 609 run_env.Requires(run_selenium_firefox, swiftshader_install) | 610 run_env.Requires(run_selenium_firefox, swiftshader_install) |
| 610 | 611 |
| 611 if run_env.Bit('windows'): | 612 if run_env.Bit('windows'): |
| 612 run_selenium_ie = run_env.Alias( | 613 run_selenium_ie = run_env.Alias( |
| 613 'selenium_ie', | 614 'selenium_ie', |
| 614 ['$ARTIFACTS_DIR/${LIBPREFIX}npo3dautoplugin$SHLIBSUFFIX', | 615 ['$ARTIFACTS_DIR/${LIBPREFIX}npo3dautoplugin$SHLIBSUFFIX', |
| 615 env.GetPublished('samples', 'asset_files')], | 616 env.GetPublished('samples', 'asset_files')], |
| 616 # TODO: have a cleaner way to do this. | 617 # TODO: have a cleaner way to do this. |
| 617 [Delete('$ARTIFACTS_DIR/selenium/screenshots_ie'), | 618 [Delete('$ARTIFACTS_DIR/selenium/screenshots_ie'), |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 # Adding extra line for cleaner formatting. | 748 # Adding extra line for cleaner formatting. |
| 748 env.Help('\n') | 749 env.Help('\n') |
| 749 | 750 |
| 750 | 751 |
| 751 #-------------------------------------------------------------------------- | 752 #-------------------------------------------------------------------------- |
| 752 # Other odds and ends | 753 # Other odds and ends |
| 753 | 754 |
| 754 # Install presubmit_tests batch file. | 755 # Install presubmit_tests batch file. |
| 755 # TODO: is this really needed anymore? | 756 # TODO: is this really needed anymore? |
| 756 env.Replicate('$ARTIFACTS_DIR', 'presubmit_tests.bat') | 757 env.Replicate('$ARTIFACTS_DIR', 'presubmit_tests.bat') |
| OLD | NEW |