Attachment 283032 Details for Bug 347966

[patch] [checked in]only turn on jprof in JS if jprof is on in tinderbox [as landed]

jprof.diff (text/plain), 3.98 KB, created by Robert Helmer [:rhelmer]

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Helmer [:rhelmer]

Size: 3.98 KB

patch

obsolete

>Index: build-seamonkey-util.pl
>===================================================================
>RCS file: /cvsroot/mozilla/tools/tinderbox/build-seamonkey-util.pl,v
>retrieving revision 1.372
>diff -u -r1.372 build-seamonkey-util.pl
>--- build-seamonkey-util.pl	7 Sep 2007 00:17:52 -0000	1.372
>+++ build-seamonkey-util.pl	1 Oct 2007 17:42:00 -0000
>@@ -2492,6 +2492,9 @@
>         run_system_cmd("sync; sleep 5", 35);
> 
>         my @urlargs = (-chrome,"file:$build_dir/mozilla/xpfe/test/winopen.xul");
>+        if ($Settings::TestWithJprof) {
>+            @urlargs = (-chrome,"javascript:try{JProfStartProfiling();}catch(e){};window.location='file:$build_dir/mozilla/xpfe/test/winopen.xul'");
>+        }
>         if($test_result eq 'success') {
>             if ($talkback_installed) {
>                 setTestnameForTalkbackReport($talkback_ini_path,$test_name);
>@@ -2684,6 +2687,11 @@
>         }
>     }
> 
>+    if ($Settings::TestWithJprof) {
>+        print_log "Running jprof for $test_name..\n";
>+        run_shell_command("cd $binary_dir && ./jprof firefox-bin jprof-log > ../$test_name-jprof.html");
>+    }
>+
>     return $rv;
> }
> 
>@@ -2758,6 +2766,9 @@
>     my $layout_time_details;
>     my $binary_log = "$build_dir/$test_name.log";
>     my $url = "http://$Settings::pageload_server/page-loader/loader.pl?delay=1000&nocache=0&maxcyc=4&timeout=$Settings::LayoutPerformanceTestPageTimeout&auto=1";
>+    if ($Settings::TestWithJprof) {
>+        $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'";
>+    }
>     
>     # Settle OS.
>     run_system_cmd("sync; sleep 5", 35);
>@@ -2834,6 +2845,9 @@
>     my $layout_time_details;
>     my $binary_log = "$build_dir/$test_name.log";
>     my $url = "http://localhost/pageload/cycler.html";
>+    if ($Settings::TestWithJprof) {
>+        $url = "javascript:try{JProfStartProfiling();}catch(e){};window.location='http://localhost/pageload/cycler.html'";
>+    }
>     
>     # Settle OS.
>     run_system_cmd("sync; sleep 5", 35);
>@@ -2890,6 +2904,9 @@
>     my $dhtml_time_details;
>     my $binary_log = "$build_dir/$test_name.log";
>     my $url = "http://www.mozilla.org/performance/test-cases/dhtml/runTests.html";
>+    if ($Settings::TestWithJprof) {
>+        $url = "javascript:try{JProfStartProfiling();}catch(e){};window.location='http://www.mozilla.org/performance/test-cases/dhtml/runTests.html'";
>+    }
>     
>     # Settle OS.
>     run_system_cmd("sync; sleep 5", 35);
>Index: post-mozilla-rel.pl
>===================================================================
>RCS file: /cvsroot/mozilla/tools/tinderbox/post-mozilla-rel.pl,v
>retrieving revision 1.135
>diff -u -r1.135 post-mozilla-rel.pl
>--- post-mozilla-rel.pl	29 Sep 2007 12:49:33 -0000	1.135
>+++ post-mozilla-rel.pl	1 Oct 2007 17:42:01 -0000
>@@ -337,6 +337,10 @@
>       $push_raw_xpis = $Settings::push_raw_xpis;
>     }
> 
>+    if ($Settings::TestWithJprof) {
>+        TinderUtils::run_shell_command("cp $package_location/../*-jprof.html $stagedir/");
>+    }
>+
>     if (TinderUtils::is_windows() || TinderUtils::is_os2()) {
>       if ($Settings::stub_installer) {
>         TinderUtils::run_shell_command("cp $package_location/stub/*.exe $stagedir/");
>Index: tinder-defaults.pl
>===================================================================
>RCS file: /cvsroot/mozilla/tools/tinderbox/tinder-defaults.pl,v
>retrieving revision 1.119
>diff -u -r1.119 tinder-defaults.pl
>--- tinder-defaults.pl	7 Sep 2007 00:17:52 -0000	1.119
>+++ tinder-defaults.pl	1 Oct 2007 17:42:01 -0000
>@@ -82,6 +82,7 @@
> # ("network","dom","toolkit","security/manager");
> $CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
>                                 # aviary directory structure?
>+$TestWithJprof            = 0;  # Use jprof profiler during tests
> 
> $TestsPhoneHome           = 0;  # Should test report back to server?
> $GraphNameOverride        = ''; # Override name built from ::hostname() and $BuildTag

Actions: View | Diff | Review

Attachments on bug 347966: 268323 | 268534 | 268574 | 279674 | 282846 | 283032