From aec54a80e11a690ab10cc06553c2300ae511e54a Mon Sep 17 00:00:00 2001 From: Erjan Gavalji Date: Mon, 2 Nov 2015 17:54:48 +0200 Subject: [PATCH] Fix the runner. Adjust the temporary run script for a relative folder structure --- gruntfile.js | 2 +- run.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index ea3771fb7..e1913143a 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -1,6 +1,6 @@ module.exports = function(grunt) { - if (grunt.cli.tasks.indexOf("testsapp") || grunt.cli.tasks.indexOf("buildtestsapp")>= 0) { + if (grunt.cli.tasks.indexOf("testsapp") >= 0 || grunt.cli.tasks.indexOf("buildtestsapp")>= 0) { var tsTester = require("./build/run-testsapp.grunt.js"); tsTester.run(grunt); } else { diff --git a/run.sh b/run.sh index 4adee5a70..373687fa8 100755 --- a/run.sh +++ b/run.sh @@ -1,9 +1,14 @@ #! /bin/bash +androidRuntimePath=realpath ../../../LATEST_RUNTIMES/tns-android.tgz + #grunt testsapp --verbose --platform=Android --emuPId=".*emulator64-x86" --avd="Api19" --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-android.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz #grunt testsapp --verbose --platform=iOS --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-ios.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz --avd="'iPhone 6 (9.0) ['" -grunt buildTestsApp --verbose --platform=iOS --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-ios.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz --avd="'iPhone 6 (9.0) ['" +#grunt buildTestsApp --verbose --platform=iOS --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-ios.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz --avd="'iPhone 6 (9.0) ['" #grunt testsapp --verbose --platform=iOS --runAppOnly --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-ios.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz --avd="'iPhone 6 (9.0) ['" + + +grunt testsapp --verbose --platform=Android --emuPId=".*emulator64-x86" --avd="Api21" --logFilePath="./TestRunResult.txt" --runtimePath=$androidRuntimePath --showEmu=true #--modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz