Attachment #268534 for bug #347966

Attachment #268534: cleanup previous patch a bit for bug #347966

View | Details | Raw Unified | Return to bug 347966
Collapse All | Expand All

(-)build-seamonkey-util.pl (-4 / +8 lines)

Line	Link Here

Lines 2439-2445	Link Here

2439

        # Settle OS.

2439

        # Settle OS.

2440

        run_system_cmd("sync; sleep 5", 35);

2440

        run_system_cmd("sync; sleep 5", 35);

2441

2442

        my @urlargs = (-chrome,"file:$build_dir/mozilla/xpfe/test/winopen.xul");

2442

        my @urlargs = (-chrome,"javascript:try{JProfStartProfiling();}catch(e){};window.location='file:$build_dir/mozilla/xpfe/test/winopen.xul'");

2443

        if($test_result eq 'success') {

2443

        if($test_result eq 'success') {

2444

            if ($talkback_installed) {

2444

            if ($talkback_installed) {

2445

                setTestnameForTalkbackReport($talkback_ini_path,$test_name);

2445

                setTestnameForTalkbackReport($talkback_ini_path,$test_name);

Lines 2632-2637	Link Here

2632

2633

2634

2635

    # FIXME check if jprof is turned on

2636

    print_log "Running jprof for $test_name..\n";

2637

    run_shell_command("cd $binary_dir && ./jprof firefox-bin jprof-log > ../$test_name-jprof.html");

2638

2635

    return $rv;

2639

    return $rv;

2636

2640

2637

2641

Lines 2705-2711	Link Here

2705

    my $layout_time;

2709

    my $layout_time;

2706

    my $layout_time_details;

2710

    my $layout_time_details;

2707

    my $binary_log = "$build_dir/$test_name.log";

2711

    my $binary_log = "$build_dir/$test_name.log";

2708

    my $url = "http://$Settings::pageload_server/page-loader/loader.pl?delay=1000&nocache=0&maxcyc=4&timeout=$Settings::LayoutPerformanceTestPageTimeout&auto=1";

2712

    my $url = "javascript:try{JProfStartProfiling();}catch(e){};window.location='http://$Settings::pageload_server/page-loader/loader.pl?delay=1000&nocache=0&maxcyc=4&timeout=$Settings::LayoutPerformanceTestPageTimeout&auto=1'";

2709

2713

2710

    # Settle OS.

2714

    # Settle OS.

2711

    run_system_cmd("sync; sleep 5", 35);

2715

    run_system_cmd("sync; sleep 5", 35);

Lines 2781-2787	Link Here

2781

    my $layout_time;

2785

    my $layout_time;

2782

    my $layout_time_details;

2786

    my $layout_time_details;

2783

    my $binary_log = "$build_dir/$test_name.log";

2787

    my $binary_log = "$build_dir/$test_name.log";

2784

    my $url = "http://localhost/pageload/cycler.html";

2788

    my $url = "javascript:try{JProfStartProfiling();}catch(e){};window.location='http://localhost/pageload/cycler.html'";

2785

2789

2786

    # Settle OS.

2790

    # Settle OS.

2787

    run_system_cmd("sync; sleep 5", 35);

2791

    run_system_cmd("sync; sleep 5", 35);

Lines 2837-2843	Link Here

2837

    my $dhtml_time;

2841

    my $dhtml_time;

2838

    my $dhtml_time_details;

2842

    my $dhtml_time_details;

2839

    my $binary_log = "$build_dir/$test_name.log";

2843

    my $binary_log = "$build_dir/$test_name.log";

2840

    my $url = "http://www.mozilla.org/performance/test-cases/dhtml/runTests.html";

2844

    my $url = "javascript:try{JProfStartProfiling();}catch(e){};window.location='http://www.mozilla.org/performance/test-cases/dhtml/runTests.html'";

2841

2845

2842

    # Settle OS.

2846

    # Settle OS.

2843

    run_system_cmd("sync; sleep 5", 35);

2847

    run_system_cmd("sync; sleep 5", 35);

(-)post-mozilla-rel.pl (+3 lines)

Line	Link Here

Lines 283-288	Link Here

283

      $push_raw_xpis = $Settings::push_raw_xpis;

283

      $push_raw_xpis = $Settings::push_raw_xpis;

284

285

286

    # FIXME if isJprof

287

    TinderUtils::run_shell_command("cp $package_location/../*-jprof.html $stagedir/");

288

286

    if (TinderUtils::is_windows() || TinderUtils::is_os2()) {

289

    if (TinderUtils::is_windows() || TinderUtils::is_os2()) {

287

      if ($Settings::stub_installer) {

290

      if ($Settings::stub_installer) {

288

        TinderUtils::run_shell_command("cp $package_location/stub/*.exe $stagedir/");

291

        TinderUtils::run_shell_command("cp $package_location/stub/*.exe $stagedir/");

Return to bug 347966