From 68a39d7fa143352b6f1269815b955300cd129720 Mon Sep 17 00:00:00 2001 From: Sebastian Goscik Date: Wed, 20 Jan 2016 16:29:38 +0000 Subject: [PATCH 1/2] bbench: Fix for web browser crash on latest Linaro release Also fixes browser permissions issues on Android 6+ --- wlauto/workloads/bbench/__init__.py | 11 + wlauto/workloads/bbench/patches/bbc.html | 1412 ++++++++++++++++++ wlauto/workloads/bbench/patches/cnn.html | 1293 ++++++++++++++++ wlauto/workloads/bbench/patches/twitter.html | 1215 +++++++++++++++ 4 files changed, 3931 insertions(+) create mode 100755 wlauto/workloads/bbench/patches/bbc.html create mode 100755 wlauto/workloads/bbench/patches/cnn.html create mode 100755 wlauto/workloads/bbench/patches/twitter.html diff --git a/wlauto/workloads/bbench/__init__.py b/wlauto/workloads/bbench/__init__.py index 3d4ce9d4..88539f5c 100644 --- a/wlauto/workloads/bbench/__init__.py +++ b/wlauto/workloads/bbench/__init__.py @@ -122,6 +122,11 @@ class BBench(Workload): self.device.execute('sync') self.device.set_sysfile_value('/proc/sys/vm/drop_caches', 3) + #On android 6+ the web browser requires permissions to access the sd card + if self.device.get_sdk_version() >= 23: + self.device.execute("pm grant com.android.browser android.permission.READ_EXTERNAL_STORAGE") + self.device.execute("pm grant com.android.browser android.permission.WRITE_EXTERNAL_STORAGE") + # Launch the background music if self.with_audio: self.device.execute('am start -W -S -n com.android.music/.MediaPlaybackActivity -d {}'.format(self.audio_on_device)) @@ -189,6 +194,12 @@ class BBench(Workload): shutil.copy(os.path.join(PATCH_FILES, "bbench.js"), self.dependencies_directory) shutil.copy(os.path.join(PATCH_FILES, "results.html"), self.dependencies_directory) shutil.copy(os.path.join(PATCH_FILES, "index_noinput.html"), self.dependencies_directory) + shutil.copy(os.path.join(PATCH_FILES, "bbc.html"), + os.path.join(self.dependencies_directory, "sites", "bbc", "www.bbc.co.uk", "index.html")) + shutil.copy(os.path.join(PATCH_FILES, "cnn.html"), + os.path.join(self.dependencies_directory, "sites", "cnn", "www.cnn.com", "index.html")) + shutil.copy(os.path.join(PATCH_FILES, "twitter.html"), + os.path.join(self.dependencies_directory, "sites", "twitter", "twitter.com", "index.html")) def _parse_metrics(logfile, indexfile, output_directory): # pylint: disable=R0914 diff --git a/wlauto/workloads/bbench/patches/bbc.html b/wlauto/workloads/bbench/patches/bbc.html new file mode 100755 index 00000000..27d46619 --- /dev/null +++ b/wlauto/workloads/bbench/patches/bbc.html @@ -0,0 +1,1412 @@ + + + + + + + + + + + + + + + + + +BBC - Homepage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ +
+

BBC Homepage

+
+
+
+

+ + Top stories » + +

+ + + +
+
+
+
+ +
+
+

+ + News » + +

+ + + +
+
+

Top Story

+
+ + + Osama Bin Laden's compound in Abbottabad + Fears for Bin Laden US Navy Seals + + + +

US Defence Secretary Robert Gates says security around the special forces unit that killed Osama Bin Laden will be tightened after it raised concerns.

+
+
+
+
+ + + Picture taken on a government tour showing a man, who officials said was wounded in an air strike, at a hospital in Tripoli May 12, 2011. + Nato in new raid on Gaddafi base + + + +

Nato air strikes again target Col Muammar Gaddafi's compound, hours after Libyan state TV showed footage purportedly of the leader in Tripoli.

+
+
+ +
+
+
+
+

+ + Business » + +

+ + + +
+
+
+

Market Data + Thu, 12 May 2011 21:59 BST

+ +
+

Marketwatch

+ (min delay 15 mins) + + Marketwatch Ticker + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Market NameCurrent ValueMovementChangePercentage Change
+ Dow Jones + + 12695.92 + + + + 65.89 + 0.52% +
+ Nasdaq + + 2863.04 + + + + 17.98 + 0.63% +
+ FTSE 100 + + 5944.96 + - + + -31.04 + -0.52% +
+ Dax + + 7443.95 + - + + -51.1 + -0.68% +
+ Cac 40 + + 4023.29 + - + + -34.79 + -0.86% +
+ + +
+ +
+
+ +
+
+

+ + Sport » + +

+ + + +
+
+
+ + + Woods out of Players Championship + Tiger Woods + + + +

Tiger Woods pulls out of the Players Championship midway through his first round with a recurrence of his knee and Achilles tendon injuries.

+
+
+ +
+
+
+
+ + +
+

+ + Entertainment & Arts » + +

+
+
+
In Association With
+
+ +
+ +
+
+
+
+

Top Story

+
+ + + We Need to Talk about Kevin director Lynne Ramsay (centre) with actors John C Reilly and Tilda Swinton + Cannes gets talking about Kevin + + + +

Critics heap praise on We Need to Talk about Kevin, the only British title in contention for the main award at the Cannes Film Festival.

+
+
+ +
+
+ +
+

+ + Health » + +

+

Top Story

+
+ + + HIV virus + Drugs 'reduce' HIV transmission + + + +

An HIV positive person can reduce the risk of spreading the virus to uninfected partners by 96% if they are given anti-retroviral drugs immediately, according to US scientists.

+
+
+ +
+
+ +
+

+ + Technology » + +

+

Top Story

+
+ + + Man's face next to Facebook logo + Facebook exposed in Google smear + + + +

Facebook admits hiring a PR agency to tout anti-Google stories related to user privacy in the US press.

+
+
+ +
+
+ +
+

+ + Science & Environment » + +

+

Top Story

+
+ + + Io pictured by Galileo + Jupiter moon 'holds magma ocean' + + + +

Data from the Galileo probe suggest Jupiter's moon Io may hold a giant magma ocean beneath its crust that is at least 50km thick.

+
+
+ +
+
+ +
+
+ +
+
+

+ + Travel » + +

+
+
+
+
In Association With
+
+ +
+ +
+
+
+ + + +
+
+ + + + +
+
+ +
+
+

+ + World Service » + +

+ + + +
+
+

Spanish +

+
+ + + Tras el terremoto, centenares de inmigrantes deambulan por Lorca + + + +

Cerca del 20% de la población son inmigrantes, la mayoría de ellos ecuatorianos que han llegado en los últimos diez años. Muchos de ellos duermen en la calle tras la tragedia del miércoles.

+
+
+
+

Chinese +

+
+ + + 研究：艾滋病毒传播风险可减96% + + + +

一项突破性研究发现，身体健康的艾滋病毒携带者在发现感染后立即服用抗逆转录病毒药，可将病毒传染给不带病毒的性伙伴的风险减少96%

+
+
+
+

Arabic +

+
+ + + زعيم معارض: القذافي "هدف مشروع" لغارات الناتو + + + +

رئيس المجلس الوطني الانتقالي الليبي المعارض يقول ان القذافي "هدف مشروع" لغارات حلف الناتو، الذي يواصل شن ضرباته على اهداف تابعة للحكومة الليبية.

+
+
+
+

Persian +

+
+ + + نویسنده نامه زندان رجایی شهر به انفرادی افتاد + + + +

مهدی محمودیان روزنامه‌نگاری که نامه‌ای در باره وقوع تجاورز جنسی در زندان رجایی شهر کرج منتشر کرده بود، به سلول انفرادی منتقل شده است.

+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+

+ Spotlight

+ + + +
+
+

Video and Audio

+
+
+
In Association With
+
+ +
+ +
+
+
+
+

Top Story

+
+ + + Her Majesty The Queen + The Queen passes a royal milestone + + + +

Queen Elizabeth II has become the second longest-serving monarch in British history, after 57 years and 97 days on the throne.

+
+
+ +
+
+
+
+

+ Most Popular in News

+ + + +
+
+ +

+ Shared +

+ + + + + +

+ Read +

+ + + + + +

+ Watched/Listened +

+ + + + + +
+ + +
+
+
+
Functionality In Association With
+
+ +
+ +
+
+
+
+
+ +
+
+

+ + Weather » + +

+
+
+
+
In Association With
+
+ +
+ +
+
+
+ + + +
+
+

London

+ +
+
+
+ + + + + + + +
+ + + +
+ +
+
+
+

 

+ +
  •  
+
+
+
+
+ Friday
+
+ + Sunny Intervals + +

Sunny Intervals

+

+ Max Temperature: + 18°C + 64°F +

+

+ Min Temperature: + 10°C + 50°F +

+
+
+ Saturday
+
+ + Sunny Intervals + +

Sunny Intervals

+

+ Max Temperature: + 16°C + 61°F +

+

+ Min Temperature: + 8°C + 46°F +

+
+
+ Sunday
+
+ + White Cloud + +

White Cloud

+

+ Max Temperature: + 13°C + 55°F +

+

+ Min Temperature: + 10°C + 50°F +

+
+
+ Monday
+
+ + White Cloud + +

White Cloud

+

+ Max Temperature: + 15°C + 59°F +

+

+ Min Temperature: + 11°C + 52°F +

+
+ +
+ +

Detailed forecast

+
+
+
+ +
+
+ +

bbc.co.uk navigation

+ +
+ +

BBC © 2011 The BBC is not responsible for the content of external sites. Read more.

This page is best viewed in an up-to-date web browser with style sheets (CSS) enabled. While you will be able to view the content of this page in your current browser, you will not be able to get the full visual experience. Please consider upgrading your browser software or enabling style sheets (CSS) if you are able to do so.

+ + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + diff --git a/wlauto/workloads/bbench/patches/cnn.html b/wlauto/workloads/bbench/patches/cnn.html new file mode 100755 index 00000000..1205c70e --- /dev/null +++ b/wlauto/workloads/bbench/patches/cnn.html @@ -0,0 +1,1293 @@ + + + + + + + + + + +CNN.com - Breaking News, U.S., World, Weather, Entertainment & Video News + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ +
+
+
+ + + + CNN + + +
+
+ + +
+
+ +
+ +
+
+ +
+ + + + + + + +
+ +
+ +
+
+
+ + + +
+ + + + +
+ + + + + + + + + + + + + + +
+ + +
updated 11:17 p.m.EST, Thu February 10, 2011

After morning prayers Friday, more Egyptian protesters are expected to arrive for what could be the largest demonstration yet. Some protesters say they fear "a bloodbath." FULL STORY | MILITARY NUDGE? | WHAT CHANGED

Don't miss

+
+ + + + + +
+ + + +
+ +
+
+ +
+ + +
+ + +
+ Hi! Log in or sign up to personalize! +
+ + +
+ + + +
+ + + +
+ Popular on Facebook +   +
+ +
+ +
+
+
+
+ +
+ + + +
+
+ +
+
+
+ +
+
+ +
+
+   +
+
+ +
+
+
+ + + + + +
+ Newspulse +   +
+ + + + + + + +
+ + Local  + + +   +
+ + + + + +
+ Sports +   +
+ + + + + + +
+ Markets +   +
+ + + + +
+ + +
+ + + + + + + +
+
+
+
+
+ +
+

U.S.

More
+
+ + +
+

World

More
+ +
+ + +
+

Business

More
+ + + + +
+ +
+ + +
+
+

Quick vote

+ +
+
+ +
+
Would you step in to stop a street crime?
+
+
+
    +
    • + +
    • + +
+
+
+ +
+
+
or view results
+
+
+
+
+ + + +
+
+ + + +
+ + +
+
+ +
+ +
+ +
+ +
+ +
+

Politics

More
+ +
+ + +
+

Entertainment

More
+
+ + +
+

Health

More
+
+ + +
+ + + + +
+ + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+

Tech

More
+
+ + +
+

Living and Eatocracy

More
+
+ + +
+

Justice

More
+
+ + + +
+ +
+ +
+ +
+ +

Sign up for breaking political news alerts from CNN and be the first to know when news happens inside the Beltway and across the country.

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+

Sports

+ +
More
+
+ + +
+

Rolling Stone

More
+
+ + +
+

Travel

More
+
+ + +
+ + +
+ +
+ +
+
+
+ CNN TV Schedule | HLN | Listen to CNN | + + +
+
+ +

CNN TV

+ +
+
+ +
+
+
+
+ The very latest from Egypt
+ Tonight, 9 ET on CNN +
+
+
+ +
+
+
+
Egypt Uprising
Tonight, 10 ET on CNN
+
+
+ +
+
+
+
Egypt in Crisis
'AM,' 6 a.m. ET on CNN
+
+
+ + + +
+ +
+ + +
+ +
+ +

Hot topics

+
+
+ + +
+ + Egypt
Hosni Mubarak
Winter Weather
Pakistan
Mexico
Donald Trump
Sarah Palin
Lindsay Lohan
Academy Awards
Miley Cyrus
+ +
+ +
+
+ +
+ +
+ +
+
+ + + +
+ + +
+ + + +
+ +
+ +
+
+
+
+
+
+
+
+ + + +
+ +
+
+ + + +
+ + + + + + + +
+
+
+ +
+
+ + + +
+ + + + + + + +
+
+
+ +
+
+ + + +
+ + + + + + + +
+
+
+ +
+ +
+ + +
+
+
+
+
+
+
+
+ + +
+
+
+ + + + +
+ +
+ +
+ + + + + +
+ +
+ +
+ + +
+ +
+
© 2011 Cable News Network. Turner Broadcasting System, Inc. All Rights Reserved.
+
Terms of service | Privacy guidelines | Ad choices | Advertise with us | About us | Contact us | Work for us | Help
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/wlauto/workloads/bbench/patches/twitter.html b/wlauto/workloads/bbench/patches/twitter.html new file mode 100755 index 00000000..1df318da --- /dev/null +++ b/wlauto/workloads/bbench/patches/twitter.html @@ -0,0 +1,1215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + THE_REAL_SHAQ (THE_REAL_SHAQ) on Twitter + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ + + + + + + +
+ + + + + +
+
+
+

+ Get short, timely messages from THE_REAL_SHAQ. +

+ +

Twitter is a rich source of instantly updated information. It's easy to stay updated on an incredibly wide variety of topics. Join today and follow @THE_REAL_SHAQ.

+
+
+
+ +
+

+ Get updates via SMS by texting follow THE_REAL_SHAQ to 40404 in the United States
+ + Codes for other countries + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Two-way (sending and receiving) short codes:
CountryCodeFor customers of
Australia +
    + +
  • + 0198089488 + Telstra +
    • + +
+
Canada +
    + +
  • + 21212 + (any) +
    • + +
+
United Kingdom +
    + +
  • + 86444 + Vodafone, Orange, 3, O2 +
    • + +
+
Indonesia +
    + +
  • + 89887 + AXIS, 3, Telkomsel +
    • + +
+
Ireland +
    + +
  • + 51210 + O2 +
    • + +
+
India +
    + +
  • + 53000 + Bharti Airtel, Videocon +
    • + +
+
Jordan +
    + +
  • + 90903 + Zain +
    • + +
+
New Zealand +
    + +
  • + 8987 + Vodafone, Telecom NZ +
    • + +
+
United States +
    + +
  • + 40404 + (any) +
    • + +
+
+
+ +

+
+
+
+ + + + + +
+ + + + + + + + + + + + +
+
+ + + + + + + + +
+
+

+ +
THE_REAL_SHAQ
+

+
+
+ + + +
+ +
+ + +
    +
  1. + + + I need all of my people to Watch my Nephew Cory Gunz New MTV Show "Son Of A Gunz" tonight at 11pm Eastern time. LET'S GO!!! + + + + 8:50 AM Apr 28th + via TweetDeck + + + +
      +
    +     +
    2. +
  2. + + + @Christleen not tru + + + + 4:29 PM Apr 23rd + via web + + in reply to Christleen + +
      +
    +     +
    3. +
  3. + + + @im_pappag copyshaq + + + + 4:27 PM Apr 23rd + via web + + in reply to im_pappag + +
      +
    +     +
    4. +
  4. + + + @flocker289 yup + + + + 4:25 PM Apr 23rd + via web + + in reply to flocker289 + +
      +
    +     +
    5. +
  5. + + + gsp ftw, dats all http://bit.ly/eo177i + + + + 3:54 PM Apr 23rd + via web + + + +
      +
    +     +
    6. +
  6. + + + @yogi4change i like dat + + + + 3:02 PM Apr 12th + via web + + in reply to yogi4change + +
      +
    +     +
    7. +
  7. + + + @jvhugg thanks man, hope u can help da kids + + + + 3:02 PM Apr 12th + via web + + in reply to jvhugg + +
      +
    +     +
    8. +
  8. + + + @TrickyTre dats true + + + + 3:01 PM Apr 12th + via web + + in reply to TrickyTre + +
      +
    +     +
    9. +
  9. + + + todays random act of shaqness, help out my little friends n be a childhelper http://bit.ly/hKFdFZ + + + + 2:56 PM Apr 12th + via web + + + +
      +
    +     +
    10. +
  10. + + + did u already bust ur shaqet or u got #butler or #uconn winning it all? chat wit me during da #ncaa finals http://phi.tv/idOlGZ + + + + 6:12 PM Apr 4th + via web + + + +
      +
    +     +
    11. +
  11. + + + u chattin when the @celtics beat da spurs tonight? best comment wins 2 free tickets from urs truly http://phi.tv/eVJWBo + + + + 2:27 PM Mar 31st + via web + + + +
      +
    +     +
    12. +
  12. + + + twitter mirror twittrr mirror on da wall whos da best twitterer of dem all? http://ti.me/g85EUt + + + + 11:31 AM Mar 29th + via web + + + +
      +
    +     +
    13. +
  13. + + + RT @realgranthill33: Me, @THE_REAL_SHAQ and James Brown in 1996 http://t.co/qOMoz0Y + + + + 8:42 AM Mar 27th + via Twitter for iPhone + + + +
      +
    +     +
    14. +
  14. + + + im chatting live during da #duke vs #arizona game, come join march shaqness lol http://phi.tv/fZsSxo #marchmadness + + + + 5:54 PM Mar 24th + via web + + + +
      +
    +     +
    15. +
  15. + + + check out @jonnybones on da @jayleno sho tonite 11:35pm ET http://bit.ly/enCsFO + + + + 5:52 PM Mar 24th + via web + + + +
      +
    +     +
    16. +
  16. + + + u complete me twitter, lol http://t.co/Riq93H4 + + + + 7:09 PM Mar 21st + via Twitter for iPhone + + + +
      +
    +     +
    17. +
  17. + + + @peterfitz I agree + + + + 8:28 PM Mar 20th + via ÜberSocial + + in reply to peterfitz + +
      +
    +     +
    18. +
  18. + + + @SamTecle hell yeah + + + + 8:28 PM Mar 20th + via ÜberSocial + + in reply to SamTecle + +
      +
    +     +
    19. +
  19. + + + @JOHELCD yes sir + + + + 8:28 PM Mar 20th + via ÜberSocial + + in reply to JOHELCD + +
      +
    +     +
    20. +
  20. + + + @tamaAK87 I hope so bro + + + + 8:25 PM Mar 20th + via ÜberSocial + + in reply to tamaAK87 + +
      +
    +     +
    21. +
+ + + +
+ + + + + +
+ 		+ +
+ +
+ + +
+ +
+ + + +
+ + + + + + +
+ + + + + 632 + Following + + + + + + + 3,773,066 + Followers + + + + + + 37,759 + Listed + + +
+ +
+ +
+ + + + + + + + +
+ + +
+ + +
+
+ + + Abella Anderson✔ + + + + Alisha Gabrielle! + + + + Kingyella.com + + + + kd Aubert + + + + beautifull april + + + + Lana Smith Brown + + + + Yomand Brown + + + + PHILO MAN + + + + brittny gastineau + + + + Vanessa rider + + + + chady dunmore + + + + Dwayne Johnson + + + + Thunderbolt + + + + Jamie Ambrosius + + + + Ashley Nichole + + + + SUMMER WALKER + + + + TwitVid + + + + Denon Wilgosh + + + + Marty Cordova + + + + Yelawolf + + + + ÜberSocial + + + + thomasobrey + + + + A. Sherrod Blakely + + + + Gurpartap  Singh + + + + Karen Farrakhan + + + + Holly Robinson Peete + + + + Aisha Nicole + + + + TRINA + + + + PilarSanders + + + + Cymatika2K11 + + + + Demetrius Davis + + + + Renee' Cobson + + + + EveryChildUSA + + + + TwitChange + + + + Jimmy Kimmel + + + + Nate Robinson + + +
+ + +
+ +
+
+ + + + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + From 82df73278e694fd762a94ca6f5b46429f059ca65 Mon Sep 17 00:00:00 2001 From: Sebastian Goscik Date: Wed, 20 Jan 2016 16:31:27 +0000 Subject: [PATCH 2/2] recentfling: Fixed inequality --- wlauto/workloads/recentfling/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlauto/workloads/recentfling/__init__.py b/wlauto/workloads/recentfling/__init__.py index c0f0c110..829afebc 100644 --- a/wlauto/workloads/recentfling/__init__.py +++ b/wlauto/workloads/recentfling/__init__.py @@ -50,7 +50,7 @@ class Recentfling(Workload): ] def initialise(self, context): # pylint: disable=no-self-use - if context.device.get_sdk_version() >= 23: + if context.device.get_sdk_version() < 23: raise WorkloadError("This workload relies on ``dumpsys gfxinfo`` \ only present in Android M and onwards")