Changeset 60652 in webkit


Ignore:
Timestamp:
Jun 3, 2010 9:22:06 PM (14 years ago)
Author:
ukai@chromium.org
Message:

2010-06-03 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Alexey Proskuryakov.

old-run-webkit-tests should use ensure-valid-python to check if it can run the websockets tests
​https://bugs.webkit.org/show_bug.cgi?id=39058

  • platform/mac-tiger/Skipped:
  • remove websocket/tests from skipped list.

2010-06-03 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Alexey Proskuryakov.

old-run-webkit-tests should use ensure-valid-python to check if it can run the websockets tests
​https://bugs.webkit.org/show_bug.cgi?id=39058

  • Scripts/ensure-valid-python:
    • Perl 5.8 doesn't have File::Temp->newdir(). Use File::Temp->tempdir() instead.
    • Add --check-only and --help option.
    • --check-only option only checks python version and don't try to install Python 2.5.
    • Set executable bit.
  • Scripts/old-run-webkit-tests:
    • Check if it can run the websocket tests by calling ensure-valid-python --check-only.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r60648 r60652  
     12010-06-03  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        old-run-webkit-tests should use ensure-valid-python to check if it can run the websockets tests
     6        https://bugs.webkit.org/show_bug.cgi?id=39058
     7
     8        * platform/mac-tiger/Skipped:
     9        - remove websocket/tests from skipped list.
     10
    1112010-06-03  Peter Kasting  <pkasting@google.com>
    212

  • trunk/LayoutTests/platform/mac-tiger/Skipped

    r60573 r60652  
    176176webarchive/test-link-rel-icon.html
    177177
    178 # Python 2.5 is required to run websocket tests
    179 websocket/tests
    180 
    181178# IndexedDB is not yet enabled.
    182179storage/indexeddb

  • trunk/WebKitTools/ChangeLog

    r60635 r60652  
     12010-06-03  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        old-run-webkit-tests should use ensure-valid-python to check if it can run the websockets tests
     6        https://bugs.webkit.org/show_bug.cgi?id=39058
     7
     8        * Scripts/ensure-valid-python:
     9          - Perl 5.8 doesn't have File::Temp->newdir().  Use File::Temp->tempdir() instead.
     10          - Add --check-only and --help option.
     11          - --check-only option only checks python version and don't try to install Python 2.5.
     12          - Set executable bit.
     13        * Scripts/old-run-webkit-tests:
     14          - Check if it can run the websocket tests by calling ensure-valid-python --check-only.
     15
    1162010-05-14  Ojan Vafai  <ojan@chromium.org>
    217

  • trunk/WebKitTools/Scripts/ensure-valid-python

    • Property svn:executable set to *
    r59538 r60652  
    3232use File::Temp qw(tempdir);
    3333use FindBin;
     34use Getopt::Long;
    3435
    3536use lib $FindBin::Bin;
    … …  
    4243
    4344# We could use a consistent download location, like the source or build directory.
    44 my $tempDirectory = File::Temp->newdir();
     45my $tempDirectory = File::Temp->tempdir("WebKitPythonXXXX");
    4546my $downloadDirectory = $tempDirectory;
    4647my $mountPoint = File::Spec->join($tempDirectory, "mount");
    … …  
    118119sub main()
    119120{
     121    my $checkOnly = 0;
     122    my $showHelp = 0;
     123    my $getOptionsResult = GetOptions(
     124        'check-only!' => \$checkOnly,
     125        'help|h' => \$showHelp,
     126    );
     127    if (!$getOptionsResult || $showHelp) {
     128        print STDERR <<HELP;
     129Usage: $0 [options]
     130  --check-only        Check python version only.
     131  -h|--help           Show this help message.
     132HELP
     133        return 1;
     134    }
    120135    # Congrats, your Python is fine.
    121136    return 0 if checkPythonVersion();
    122    
     137
     138    return 1 if $checkOnly;
     139
    123140    if (!isTiger()) {
    124         print "Your Python version is insuficient to run WebKit's Python code.  Please update.\n";
     141        print "Your Python version is insufficient to run WebKit's Python code.  Please update.\n";
    125142        print "See http://trac.webkit.org/wiki/PythonGuidelines for more info.\n";
    126143        return 1;

  • trunk/WebKitTools/Scripts/old-run-webkit-tests

    r60586 r60652  
    7777sub buildPlatformResultHierarchy();
    7878sub buildPlatformTestHierarchy(@);
     79sub checkPythonVersion();
    7980sub closeCygpaths();
    8081sub closeDumpTool();
    … …  
    150151my $stripEditingCallbacks = isCygwin();
    151152my $testHTTP = 1;
     153my $testWebSocket = 1;
    152154my $testMedia = 1;
    153155my $tmpDir = "/tmp";
    … …  
    223225    print "WARNING: Your platform is not recognized. Any platform-specific results will be generated in platform/undefined.\n";
    224226    $platform = "undefined";
     227}
     228
     229if (!checkPythonVersion()) {
     230    print "WARNING: Your platform does not have Python 2.5+, which is required to run websocket server, so disabling websocket/tests.\n";
     231    $testWebSocket = 0;
    225232}
    226233
    … …  
    458465    $ignoredDirectories{'websocket'} = 1;
    459466}
     467if (!$testWebSocket) {
     468    $ignoredDirectories{'websocket'} = 1;
     469}
    460470
    461471if (!$testMedia) {
    … …  
    14271437}
    14281438
     1439sub checkPythonVersion()
     1440{
     1441    system "WebKitTools/Scripts/ensure-valid-python", "--check-only";
     1442    return exitStatus($?) == 0;
     1443}
     1444
    14291445sub openWebSocketServerIfNeeded()
    14301446{
Note: See TracChangeset for help on using the changeset viewer.