major mods for cmdline params, one script for desktop/android, etc. …

clear_apps.sh

@@ -7,9 +7,10 @@ apps=("org.mozilla.firefox" \
       "org.mozilla.fenix.performancetest" \
       "org.mozilla.fennec_aurora")
 
+export adb_bin=/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb
 for app in ${apps[@]}; do
-  echo adb -s $ANDROID_SERIAL shell am force-stop $app
-  adb -s $ANDROID_SERIAL shell am force-stop $app
-  echo adb -s $ANDROID_SERIAL shell pm clear $app
-  adb -s $ANDROID_SERIAL shell pm clear $app
+  echo $adb_bin -s $ANDROID_SERIAL shell am force-stop $app
+  $adb_bin -s $ANDROID_SERIAL shell am force-stop $app
+  echo $adb_bin -s $ANDROID_SERIAL shell pm clear $app
+  $adb_bin -s $ANDROID_SERIAL shell pm clear $app
 done

desktop.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+
+BASE='/home/jesup/src/mozilla/browsertime_on_android_scripts/'
+
+#$BROWSERTIME_BIN \
+#    --browser firefox                                               \
+#N    --skipHar \
+#    --firefox.binaryPath=/home/jesup/src/mozilla/pageload/obj-opt/dist/bin/firefox \
+if test $PERF; then
+    SCRIPT=${BASE}perf.sh
+else
+    SCRIPT=$FIREFOX_BINARY_LOCATION
+fi
+echo ./mach browsertime \
+    --firefox.binaryPath=\'"$SCRIPT"\' \
+  "$@"
+
+./mach browsertime \
+    --firefox.binaryPath=\'"$SCRIPT"\' \
+  "$@"
+#!/bin/bash
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+
+BASE='/home/jesup/src/mozilla/browsertime_on_android_scripts/'
+
+#$BROWSERTIME_BIN \
+#    --browser firefox                                               \
+#N    --skipHar \
+#    --firefox.binaryPath=/home/jesup/src/mozilla/pageload/obj-opt/dist/bin/firefox \
+if test $PERF; then
+    SCRIPT=${BASE}perf.sh
+else
+    SCRIPT=$FIREFOX_BINARY_LOCATION
+fi
+echo ./mach browsertime \
+    --firefox.binaryPath=\'"$SCRIPT"\' \
+  "$@"
+
+./mach browsertime \
+    --firefox.binaryPath=\'"$SCRIPT"\' \
+  "$@"

fenix_no_clear.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+#: PACKAGE ${PACKAGE:=org.mozilla.firefox}
+: PACKAGE ${PACKAGE:=org.mozilla.fenix.performancetest}
+
+export adb_bin="/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb"
+
+if [[ -n $ANDROID_SERIAL ]] ; then
+    DEVICE_SERIAL_ARGS="--firefox.android.deviceSerial=$ANDROID_SERIAL --chrome.android.deviceSerial=$ANDROID_SERIAL"
+else
+    DEVICE_SERIAL_ARGS=
+fi
+
+export BROWSERTIME_BIN=tools/browsertime/node_modules/browsertime/bin/browsertime.js
+
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+$BROWSERTIME_BIN \
+    --android \
+    --skipHar \
+    --firefox.geckodriverPath="/home/jesup/src/mozilla/browsertime_on_android_scripts/geckodriver" \
+    --firefox.android.package "$PACKAGE" \
+    --firefox.android.activity "org.mozilla.fenix.IntentReceiverActivity" \
+    --firefox.android.intentArgument=-a \
+    --firefox.android.intentArgument=android.intent.action.VIEW \
+    --firefox.android.intentArgument=-d \
+    --firefox.android.intentArgument="data:," \
+    --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
+    --firefox.android.intentArgument=--ez \
+    --firefox.android.intentArgument=performancetest \
+    --firefox.android.intentArgument=true \
+    --firefox.geckoProfiler true --firefox.geckoProfilerParams.interval 5  --firefox.geckoProfilerParams.features "js,stackwalk,leaf" --firefox.geckoProfilerParams.threads "GeckoMain,socket,url,ava,cert,html" \
+    --pageCompleteWaitTime 10000 \
+    -n 3 \
+    --resultDir "browsertime-results/remote_settings_condprof/" \
+    --browsertime.url https://www.google.com/ \
+    --firefox.profileTemplate=/home/jesup/src/mozilla/browsertime_on_android_scripts/fenix.profile \
+    --firefox.preference services.settings.loglevel:debug \
+    https://www.google.com/ 
+
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fenix_perf.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export adb_bin="~/.mozbuild/android-sdk-linux/platform-tools/adb"
+
 bash ./clear_apps.sh
 
 if [[ -n $ANDROID_SERIAL ]] ; then
@@ -24,7 +26,8 @@ $BROWSERTIME_BIN \
     --firefox.android.intentArgument=-d \
     --firefox.android.intentArgument="$LAUNCH_URL" \
     --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
     $DEVICE_SERIAL_ARGS \
     "$@"
 
-adb -s $ANDROID_SERIAL shell am force-stop $PACKAGE
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fenix_performancetest.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+: PACKAGE ${PACKAGE:=org.mozilla.fenix.performancetest}
+
+bash /home/jesup/src/mozilla/browsertime_on_android_scripts/clear_apps.sh
+export adb_bin="/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb"
+
+if [[ -n $ANDROID_SERIAL ]] ; then
+    DEVICE_SERIAL_ARGS="--firefox.android.deviceSerial=$ANDROID_SERIAL --chrome.android.deviceSerial=$ANDROID_SERIAL"
+else
+    DEVICE_SERIAL_ARGS=
+fi
+
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+$BROWSERTIME_BIN \
+    --android \
+    --skipHar \
+    --firefox.geckodriverPath="$GECKODRIVER_PATH" \
+    --firefox.android.package "$PACKAGE" \
+    --firefox.android.activity "org.mozilla.fenix.IntentReceiverActivity" \
+    --firefox.android.intentArgument=-a \
+    --firefox.android.intentArgument=android.intent.action.VIEW \
+    --firefox.android.intentArgument=-d \
+    --firefox.android.intentArgument="data:," \
+    --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
+    $DEVICE_SERIAL_ARGS \
+    "$@"
+
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fenix_performancetest_condprof.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+: PACKAGE ${PACKAGE:=org.mozilla.fenix.performancetest}
+
+bash /home/jesup/src/mozilla/browsertime_on_android_scripts/clear_apps.sh
+export adb_bin="/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb"
+
+if [[ -n $ANDROID_SERIAL ]] ; then
+    DEVICE_SERIAL_ARGS="--firefox.android.deviceSerial=$ANDROID_SERIAL --chrome.android.deviceSerial=$ANDROID_SERIAL"
+else
+    DEVICE_SERIAL_ARGS=
+fi
+
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+$BROWSERTIME_BIN \
+    --android \
+    --skipHar \
+    --firefox.geckodriverPath="$GECKODRIVER_PATH" \
+    --firefox.android.package "$PACKAGE" \
+    --firefox.android.activity "org.mozilla.fenix.IntentReceiverActivity" \
+    --firefox.android.intentArgument=-a \
+    --firefox.android.intentArgument=android.intent.action.VIEW \
+    --firefox.android.intentArgument=-d \
+    --firefox.android.intentArgument="data:," \
+    --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
+    --firefox.profileTemplate=/home/jesup/src/mozilla/browsertime_on_android_scripts/fenix.profile \
+    $DEVICE_SERIAL_ARGS \
+    "$@"
+
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fenix_release.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+: PACKAGE ${PACKAGE:=org.mozilla.firefox}
+
+bash /home/jesup/src/mozilla/browsertime_on_android_scripts/clear_apps.sh
+export adb_bin="/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb"
+
+if [[ -n $ANDROID_SERIAL ]] ; then
+    DEVICE_SERIAL_ARGS="--firefox.android.deviceSerial=$ANDROID_SERIAL --chrome.android.deviceSerial=$ANDROID_SERIAL"
+else
+    DEVICE_SERIAL_ARGS=
+fi
+
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+$BROWSERTIME_BIN \
+    --android \
+    --skipHar \
+    --firefox.geckodriverPath="$GECKODRIVER_PATH" \
+    --firefox.android.package "$PACKAGE" \
+    --firefox.android.activity "org.mozilla.fenix.IntentReceiverActivity" \
+    --firefox.android.intentArgument=-a \
+    --firefox.android.intentArgument=android.intent.action.VIEW \
+    --firefox.android.intentArgument=-d \
+    --firefox.android.intentArgument="data:," \
+    --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
+    --firefox.android.intentArgument=--ez \
+    --firefox.android.intentArgument=performancetest \
+    --firefox.android.intentArgument=true \
+    $DEVICE_SERIAL_ARGS \
+    "$@"
+
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fenix_release_condprof.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+: PACKAGE ${PACKAGE:=org.mozilla.firefox}
+
+bash /home/jesup/src/mozilla/browsertime_on_android_scripts/stop_apps.sh
+export adb_bin="/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb"
+
+if [[ -n $ANDROID_SERIAL ]] ; then
+    DEVICE_SERIAL_ARGS="--firefox.android.deviceSerial=$ANDROID_SERIAL --chrome.android.deviceSerial=$ANDROID_SERIAL"
+else
+    DEVICE_SERIAL_ARGS=
+fi
+
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+$BROWSERTIME_BIN \
+    --android \
+    --skipHar \
+    --firefox.geckodriverPath="$GECKODRIVER_PATH" \
+    --firefox.android.package "$PACKAGE" \
+    --firefox.android.activity "org.mozilla.fenix.IntentReceiverActivity" \
+    --firefox.android.intentArgument=-a \
+    --firefox.android.intentArgument=android.intent.action.VIEW \
+    --firefox.android.intentArgument=-d \
+    --firefox.android.intentArgument="data:," \
+    --firefox.profileTemplate=/home/jesup/src/mozilla/browsertime_on_android_scripts/fenix.profile \
+    --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
+    --firefox.android.intentArgument=--ez \
+    --firefox.android.intentArgument=performancetest \
+    --firefox.android.intentArgument=true \
+    $DEVICE_SERIAL_ARGS \
+    "$@"
+
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fennec.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export adb_bin="~/.mozbuild/android-sdk-linux/platform-tools/adb"
 bash ./clear_apps.sh
 
 if [[ -n $ANDROID_SERIAL ]] ; then
@@ -24,7 +25,8 @@ $BROWSERTIME_BIN \
     --firefox.android.intentArgument=skipstartpane                  \
     --firefox.android.intentArgument=true                           \
     --browser firefox                                               \
+    --firefox.binaryPath=/tmp/foo \
     $DEVICE_SERIAL_ARGS                                             \
   "$@"
 
-adb -s $ANDROID_SERIAL shell am force-stop $PACKAGE
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

fennec_condprof.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+: PACKAGE ${PACKAGE:=org.mozilla.firefox}
+
+bash /home/jesup/src/mozilla/browsertime_on_android_scripts/stop_apps.sh
+export adb_bin="/home/jesup/.mozbuild/android-sdk-linux/platform-tools/adb"
+
+if [[ -n $ANDROID_SERIAL ]] ; then
+    DEVICE_SERIAL_ARGS="--firefox.android.deviceSerial=$ANDROID_SERIAL --chrome.android.deviceSerial=$ANDROID_SERIAL"
+else
+    DEVICE_SERIAL_ARGS=
+fi
+
+# N.B.: yargs doesn't parse `--firefox.android.intentArgument --ez`
+# properly, so always use `=--ez`!
+$BROWSERTIME_BIN \
+    --android \
+    --skipHar \
+    --firefox.geckodriverPath="$GECKODRIVER_PATH"                   \
+    --firefox.android.package "$PACKAGE"                            \
+    --firefox.android.activity 'org.mozilla.gecko.BrowserApp'       \
+    --firefox.android.intentArgument=-a                             \
+    --firefox.android.intentArgument=android.intent.action.VIEW     \
+    --firefox.android.intentArgument=-d                             \
+    --firefox.android.intentArgument="data:,"                       \
+    --firefox.android.intentArgument=--ez                           \
+    --firefox.android.intentArgument=skipstartpane                  \
+    --firefox.android.intentArgument=true                           \
+    --browser firefox                                               \
+    --firefox.binaryPath=/tmp/foo \
+    --firefox.profileTemplate=/home/jesup/src/mozilla/browsertime_on_android_scripts/fennec.profile \
+    $DEVICE_SERIAL_ARGS                                             \
+  "$@"
+
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

gve.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export adb_bin="~/.mozbuild/android-sdk-linux/platform-tools/adb"
 bash ./clear_apps.sh
 
 if [[ -n $ANDROID_SERIAL ]] ; then
@@ -21,7 +22,8 @@ $BROWSERTIME_BIN \
     --firefox.android.intentArgument=-d \
     --firefox.android.intentArgument="$LAUNCH_URL" \
     --browser firefox \
+    --firefox.binaryPath=/tmp/foo \
     $DEVICE_SERIAL_ARGS \
     "$@"
 
-adb -s $ANDROID_SERIAL shell am force-stop $PACKAGE
+$adb_bin -s $ANDROID_SERIAL shell am force-stop $PACKAGE

perf.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo perf record -g -F 999 $FIREFOX_BINARY_LOCATION $* >/tmp/command
+perf record -g -F 999 $FIREFOX_BINARY_LOCATION $*

preload.js

@@ -1,8 +1,8 @@
 module.exports = async function(context, commands) {
   let url = context.options.browsertime.url;
   await commands.navigate('https://www.mozilla.org/en-US/');
-  await commands.wait.byTime(10000);
-  await commands.navigate('about:blank');
   await commands.wait.byTime(5000);
+  await commands.navigate('about:blank');
+  await commands.wait.byTime(2000);
   return commands.measure.start(url);
 };

preload_slim.js

@@ -0,0 +1,8 @@
+module.exports = async function(context, commands) {
+  let url = context.options.browsertime.url;
+//  await commands.navigate('https://www.example.com');
+//  await commands.wait.byTime(10000);
+//  await commands.navigate('about:blank');
+//  await commands.wait.byTime(5000);
+  return commands.measure.start(url);
+};