Changeset 52062 in webkit


Ignore:
Timestamp:
Dec 12, 2009 8:26:23 PM (14 years ago)
Author:
mjs@apple.com
Message:

2009-12-12 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Oliver Hunt.

Enable Web-hosted version of SunSpider to handle multiple versions
​https://bugs.webkit.org/show_bug.cgi?id=32478

  • make-hosted: Now generate the hosted version to be able to run both the 0.9 and the 0.9.1 test suites.
  • hosted: Modified property svn:ignore.
  • hosted/sunspider-driver.html: Removed.
  • hosted/sunspider-results.html: Removed.
  • hosted/sunspider.html:
  • hosted/versions.html: Added.
  • resources/TEMPLATE.html:
  • resources/driver-TEMPLATE.html: Copied from hosted/sunspider-driver.html.
  • resources/driver-TEMPLATE.html: Copied from hosted/sunspider-results.html.
Location:
trunk/SunSpider
Files:
1 added
5 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/SunSpider/ChangeLog

    r52057 r52062  
     12009-12-12  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Oliver Hunt.
     4
     5        Enable Web-hosted version of SunSpider to handle multiple versions
     6        https://bugs.webkit.org/show_bug.cgi?id=32478
     7
     8        * make-hosted: Now generate the hosted version to be able to run both the
     9        0.9 and the 0.9.1 test suites.
     10        * hosted: Modified property svn:ignore.
     11        * hosted/sunspider-driver.html: Removed.
     12        * hosted/sunspider-results.html: Removed.
     13        * hosted/sunspider.html:
     14        * hosted/versions.html: Added.
     15        * resources/TEMPLATE.html:
     16        * resources/driver-TEMPLATE.html: Copied from hosted/sunspider-driver.html.
     17        * resources/driver-TEMPLATE.html: Copied from hosted/sunspider-results.html.
     18
    1192009-12-12  Maciej Stachowiak  <mjs@apple.com>
    220

  • trunk/SunSpider/hosted

    • Property svn:ignore

      •  

        old new  
        1 3d-cube.html
        2 3d-morph.html
        3 3d-raytrace.html
        4 access-binary-trees.html
        5 access-fannkuch.html
        6 access-nbody.html
        7 access-nsieve.html
        8 bitops-3bit-bits-in-byte.html
        9 bitops-bits-in-byte.html
        10 bitops-bitwise-and.html
        11 bitops-nsieve-bits.html
        12 controlflow-recursive.html
        13 crypto-aes.html
        14 crypto-md5.html
        15 crypto-sha1.html
        16 date-format-tofte.html
        17 date-format-xparb.html
        18 math-cordic.html
        19 math-partial-sums.html
        20 math-spectral-norm.html
        21 regexp-dna.html
        22 string-base64.html
        23 string-fasta.html
        24 string-tagcloud.html
        25 string-unpack-code.html
        26 string-validate-input.html
         1sunspider-0.9
         2sunspider-0.9.1
        273sunspider-analyze-results.js
        284sunspider-compare-results.js

  • trunk/SunSpider/hosted/sunspider.html

    r29030 r52062  
    7070</dl>
    7171
    72 <p><a href="sunspider-driver.html">Start Now!</a><br>
     72<p><b>Current version - sunspider-0.9:</b> <a href="sunspider-0.9/driver.html">Start Now!</a><br>
    7373<small>(When you run the benchmark, be patient - it loops through all of the
    7474test cases five times and can take a minute or longer to complete.)</small></p>
     75
     76<a href="versions.html">All versions.</a>
    7577
    7678</body>

  • trunk/SunSpider/make-hosted

    r52057 r52062  
    3030close TEMPLATE;
    3131
     32open DRIVER_TEMPLATE, "<resources/driver-TEMPLATE.html";
     33my $driverTemplate = do { local $/; <DRIVER_TEMPLATE> };
     34close DRIVER_TEMPLATE;
     35
     36open RESULTS_TEMPLATE, "<resources/results-TEMPLATE.html";
     37my $resultsTemplate = do { local $/; <RESULTS_TEMPLATE> };
     38close RESULTS_TEMPLATE;
     39
    3240my @tests = ();
    3341my @categories = ();
    3442my %uniqueCategories = ();
    3543
    36 open TESTLIST, "<./tests/sunspider-0.9/LIST";
    37 while (<TESTLIST>) {
    38     chomp;
    39     next unless $_;
    40     push @tests, $_;
    41     my $category = $_;
    42     $category =~ s/-.*//;
    43     if (!$uniqueCategories{$category}) {
    44         push @categories, $category;
    45         $uniqueCategories{$category} = $category;
     44my @suites = ("sunspider-0.9", "sunspider-0.9.1");
     45
     46foreach my $suite (@suites) {
     47
     48    mkdir "hosted/${suite}";
     49
     50    open TESTLIST, "<./tests/${suite}/LIST";
     51    while (<TESTLIST>) {
     52        chomp;
     53        next unless $_;
     54        push @tests, $_;
     55        my $category = $_;
     56        $category =~ s/-.*//;
     57        if (!$uniqueCategories{$category}) {
     58            push @categories, $category;
     59            $uniqueCategories{$category} = $category;
     60        }
    4661    }
    47 }
    48 close TESTLIST;
     62    close TESTLIST;
    4963
    50 for my $test (@tests) {
    51     my $name = "${test}";
     64    for my $test (@tests) {
     65        my $name = "${test}";
    5266
    53     open SCRIPT, "<tests/sunspider-0.9/${test}.js";
    54     my $script = do { local $/; <SCRIPT> };
    55     close SCRIPT;
     67        open SCRIPT, "<tests/${suite}/${test}.js";
     68        my $script = do { local $/; <SCRIPT> };
     69        close SCRIPT;
    5670
    57     my $output = $template;
    58     $output =~ s/\@NAME\@/${name}/g;
    59     $output =~ s/\@SCRIPT\@/${script}/g;
     71        my $output = $template;
     72        $output =~ s/\@NAME\@/${name}/g;
     73        $output =~ s/\@SCRIPT\@/${script}/g;
    6074
    61     open OUTPUT, ">hosted/${test}.html";
     75        open OUTPUT, ">hosted/${suite}/${test}.html";
     76        print OUTPUT $output;
     77        close OUTPUT;
     78    }
     79
     80    my $output = $driverTemplate;
     81    $output =~ s/\@SUITE\@/${suite}/g;
     82
     83    open OUTPUT, ">hosted/${suite}/driver.html";
    6284    print OUTPUT $output;
    6385    close OUTPUT;
    64 }
     86
     87    $output = $resultsTemplate;
     88    $output =~ s/\@SUITE\@/${suite}/g;
     89
     90    open OUTPUT, ">hosted/${suite}/results.html";
     91    print OUTPUT $output;
     92    close OUTPUT;
    6593
    6694
    67 my $prefix = "var tests = [ " . join(", ", map { '"' . $_ . '"' } @tests) . " ];\n";
    68 $prefix .= "var categories = [ " . join(", ", map { '"' . $_ . '"' } @categories) . " ];\n";
     95    my $prefix = "var tests = [ " . join(", ", map { '"' . $_ . '"' } @tests) . " ];\n";
     96    $prefix .= "var categories = [ " . join(", ", map { '"' . $_ . '"' } @categories) . " ];\n";
    6997
    70 open PREFIX, ">hosted/sunspider-test-prefix.js";
    71 print PREFIX $prefix;
    72 close PREFIX;
     98    open PREFIX, ">hosted/${suite}/sunspider-test-prefix.js";
     99    print PREFIX $prefix;
     100    close PREFIX;
     101
     102   
     103}
    73104
    74105system("cp resources/sunspider-analyze-results.js hosted");
    75106system("cp resources/sunspider-compare-results.js hosted");
    76 
    77107print "hosted/sunspider.html is ready to use.\n";

  • trunk/SunSpider/resources/TEMPLATE.html

    r52057 r52062  
    2727
    2828<title>SunSpider @NAME@</title>
    29 <link rel="stylesheet" href="sunspider.css">
     29<link rel="stylesheet" href="../sunspider.css">
    3030</head>
    3131
    … …  
    3434<div id="console">
    3535</div>
    36 <script src="sunspider-record-result.js"></script>
     36<script src="../sunspider-record-result.js"></script>
    3737<script>
    3838

  • trunk/SunSpider/resources/driver-TEMPLATE.html

    r52058 r52062  
    2828
    2929<title>SunSpider JavaScript Benchmark (In Progress...)</title>
    30 <link rel="stylesheet" href="sunspider.css"></link>
     30<link rel="stylesheet" href="../sunspider.css"></link>
    3131</head>
    3232
    … …  
    3434
    3535<h2><span id="logo">&#x2600;</span>SunSpider JavaScript Benchmark <small>(In Progress...)</small></h2>
     36<h4>Version: @SUITE@</h4>
    3637
    3738<script src="sunspider-test-prefix.js"></script>
    … …  
    8586    outputString += "}";
    8687
    87     location = "sunspider-results.html?" + encodeURI(outputString);
     88    location = "results.html?" + encodeURI(outputString);
    8889}
    8990

  • trunk/SunSpider/resources/results-TEMPLATE.html

    r52058 r52062  
    2828
    2929<title>SunSpider JavaScript Benchmark Results</title>
    30 <link rel="stylesheet" href="sunspider.css"></link>
     30<link rel="stylesheet" href="../sunspider.css"></link>
    3131</head>
    3232
    … …  
    3434<h2><span id="logo">&#x2600;</span>SunSpider JavaScript Benchmark Results</h2>
    3535
    36 <p><a href="sunspider-driver.html">Run Again</a></p>
     36<h4>Version: @SUITE@</h4>
     37
     38<p><a href="driver.html">Run Again</a></p>
    3739
    3840<p><input style="width: 90%;" id="selfUrl" type="text" readonly="readonly"></input><br>
    … …  
    7375
    7476<script src="sunspider-test-prefix.js"></script>
    75 <script src="sunspider-analyze-results.js"></script>
    76 <script src="sunspider-compare-results.js"></script>
     77<script src="../sunspider-analyze-results.js"></script>
     78<script src="../sunspider-compare-results.js"></script>
    7779
    7880<script>
Note: See TracChangeset for help on using the changeset viewer.