diff --git a/apps/tests/app/mainPage.ts b/apps/tests/app/mainPage.ts index 214ed88c6..ddfe17f91 100644 --- a/apps/tests/app/mainPage.ts +++ b/apps/tests/app/mainPage.ts @@ -7,9 +7,15 @@ trace.enable(); trace.addCategories(trace.categories.Test + "," + trace.categories.Error); export function createPage() { - tests.runAll(); +// tests.runAll(); var page = new Page(); - page.content = new GridLayout(); + page.on("navigatedTo", function() { + setTimeout(function() { + tests.runAll(); + }, 3000); + }); +// page.content = new GridLayout(); return page; -} \ No newline at end of file +} + diff --git a/expect.exp b/expect.exp index 22b575a5c..a3abc321c 100755 --- a/expect.exp +++ b/expect.exp @@ -10,6 +10,8 @@ set timeout 600 -spawn adb logcat | tee __TESTRESULT__.txt +#spawn (adb logcat | tee ./__TESTRESULT__.txt) +log_file -noappend ./__TESTRESULT__.txt +spawn adb logcat expect '=== ALL TESTS COMPLETE ===' send \003 diff --git a/runtestsapp.sh b/runtestsapp.sh index 0d157e433..0448201da 100755 --- a/runtestsapp.sh +++ b/runtestsapp.sh @@ -4,6 +4,8 @@ rm -rd $workingdir mkdir $workingdir cd $workingdir +#android create avd -t "android-21" -n Api21 -b "default/x86" + #if [ 1 == 2 ] ; then echo "------------------------------------------------" echo "Killing the emulator..." @@ -11,7 +13,7 @@ cd $workingdir echo "------------------------------------------------" echo "Starting the emulator..." - time emulator -avd Api19 -no-skin -no-audio & + time emulator -avd Api19 -no-skin -no-audio & # -gpu on #emulator -avd Api19 -no-skin -no-audio -no-window & echo "------------------------------------------------" @@ -30,7 +32,9 @@ cd $workingdir echo "------------------------------------------------" echo "Adding the android platform..." time tns platform add android #--frameworkPath=/Users/erjan/tns-android.tgz + # #DO THE REPLACEMENTS IN THE Info.plist and AndroidManifest.xml + cp /Users/erjan/work/spikes/__DEL__/AndroidManifest.xml platforms/android/src/main/ echo "------------------------------------------------" echo "Building the application..."