From 77da614b3de8d6674d941904e24d70965bcc317f Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Fri, 9 Oct 2015 10:48:08 +0300
Subject: [PATCH] Attempt fixing the slow run by changing the main page and
 removing the noskin in the emulator. Time the expect run

---
 apps/tests/app/mainPage.ts | 11 ++++-------
 expect.exp                 |  2 +-
 runtestsapp.sh             |  5 +++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/tests/app/mainPage.ts b/apps/tests/app/mainPage.ts
index ddfe17f91..04200e127 100644
--- a/apps/tests/app/mainPage.ts
+++ b/apps/tests/app/mainPage.ts
@@ -7,15 +7,12 @@ trace.enable();
 trace.addCategories(trace.categories.Test + "," + trace.categories.Error);
 
 export function createPage() {
-//    tests.runAll();
-
     var page = new Page();
-    page.on("navigatedTo", function() {
-        setTimeout(function() {
+    var navigatedToHandler = function() {
         tests.runAll();
-        }, 3000);
-    });
-//    page.content = new GridLayout();
+        page.off("navigatedTo", navigatedToHandler);
+    };
+    page.on("navigatedTo", navigatedToHandler);
     return page;
 }
 
diff --git a/expect.exp b/expect.exp
index a3abc321c..ebbd5ea98 100755
--- a/expect.exp
+++ b/expect.exp
@@ -9,7 +9,7 @@
 #send \003
 
 
-set timeout 600
+set timeout 1200
 #spawn (adb logcat | tee ./__TESTRESULT__.txt)
 log_file -noappend ./__TESTRESULT__.txt
 spawn adb logcat
diff --git a/runtestsapp.sh b/runtestsapp.sh
index 0448201da..5fcacba95 100755
--- a/runtestsapp.sh
+++ b/runtestsapp.sh
@@ -13,7 +13,8 @@ cd $workingdir
 
     echo "------------------------------------------------"
     echo "Starting the emulator..."
-    time emulator -avd Api19 -no-skin -no-audio &  # -gpu on
+    #time emulator -avd Api19 -no-skin -no-audio &  # -gpu on
+    time emulator -avd Api19 -no-audio &  # -gpu on
     #emulator -avd Api19 -no-skin -no-audio -no-window &
 
     echo "------------------------------------------------"
@@ -66,4 +67,4 @@ cd $startdir
 
 echo "------------------------------------------------"
 echo "Waiting for the tests to finish executing..."
-./expect.exp
+time ./expect.exp