update scripts, remove sleep

Author: DanielZlotin

measure/scripts/downloadPublishedVersion.js

@@ -1,15 +1,15 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const version = process.argv.splice(process.execArgv.length + 2)[0];
+let version = process.argv.splice(process.execArgv.length + 2)[0];
 const scriptDir = __dirname;
 const distDir = `${scriptDir}/../../dist`;
 
 run();
 
 function run() {
   if (!version) {
-    throw new Error(`usage: npm run downloadPublishedVersion 224109`)
+    version = require('../../package.json').version;
   }
   const url = exec.execSyncRead(`npm view jsc-android@${version} dist.tarball`);
   exec.execSync(`curl ${url} | tar -xf -`);

measure/scripts/measure.js

@@ -37,16 +37,20 @@ function run() {
     launchProfiler();
     clickOnJsTest();
     killProfiler();
+    resultsStr += readLogcatFilteredOutput() + '\n';
+    clearLogcat();
 
     launchProfiler();
     clickOnFlatRenderTest();
     killProfiler();
+    resultsStr += readLogcatFilteredOutput() + '\n';
+    clearLogcat();
 
     launchProfiler();
     clickOnDeepRenderTest();
     killProfiler();
-
     resultsStr += readLogcatFilteredOutput() + '\n';
+    clearLogcat();
   })
 
   const resultLines = _.split(resultsStr, '\n');
@@ -92,14 +96,14 @@ function waitForLogcatMsg(msg) {
 
 function launchProfiler() {
   console.log(`launching...`);
-  exec.execSyncSilent(`adb shell am start-activity -W "${PACKAGE_NAME}/.${ACTIVITY_NAME}" && sleep 2`);
+  exec.execSyncSilent(`adb shell am start-activity -W "${PACKAGE_NAME}/.${ACTIVITY_NAME}"`);
+  waitForLogcatMsg(`${LOGCAT_TAG}:ApplicationLoadedAndRendered`);
 }
 
 function killProfiler() {
   console.log(`killing`);
   exec.execSyncSilent(`adb shell am force-stop ${PACKAGE_NAME}`);
   exec.execSyncSilent(`adb shell am kill ${PACKAGE_NAME}`);
-  exec.execSyncSilent(`sleep 2`);
 }
 
 function clickOnJsTest() {