[piexwasm] tests.js: better measure piex test time

Measure the test time (viz., fetch and piex processing time, including
the cost of extracting the preview / thumbnail images). Accumlate that
test time into a window.testTime global, controlled by test.js.

Minor test.sh change: force grep to treat its input as text.

Bug: 935285
Change-Id: I13c66e0f803677f0cd22d7507e479bd02e0e7462
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548961
Commit-Queue: Noel Gordon <noel@chromium.org>
Reviewed-by: Alex Danilo <adanilo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#647125}

ui/file_manager/image_loader/piex/tests.html

@@ -29,7 +29,7 @@ piex wasm raw image preview / thumbnail test page
     process(resolve, reject) {
       if (this.length <= 0 || this.length >= Math.pow(2, 30))
         return reject(new Error('invalid image length'));
- 
+
       const memory = Module._malloc(this.length);
       if (!memory)
         return reject(new Error('image malloc failure'));
@@ -186,20 +186,24 @@ piex wasm raw image preview / thumbnail test page
     // Fetch the image in an array buffer.
     let time = performance.now();
     const buffer = await fetch(image).then(r => r.arrayBuffer());
-    time = performance.now() - time;
-    console.log('test: fetch time', time.toFixed(3) + 'ms');
+    const elapsed = performance.now() - time;
+    console.log('test: fetch time', elapsed.toFixed(3));
 
     // Extract its preview and thumbnail images, render them.
-    time = performance.now();
     new Promise((resolve, reject) => {
       new ImageBuffer(buffer).process(resolve, reject);
     }).then((imageBuffer) => {
+      let preview = imageBuffer.preview();
+      let thumb = imageBuffer.thumbnail();
       time = performance.now() - time;
-      console.log('test: result ' + JSON.stringify(imageBuffer.result));
+      const maker = imageBuffer.result.maker || '';
+      const model = imageBuffer.result.model || '';
+      console.log('test:', image, maker, model);
       window.images_ = 0;
-      renderResult(image, imageBuffer.preview());
-      renderResult(image, imageBuffer.thumbnail());
-      console.log('test: done', time.toFixed(3) + 'ms');
+      renderResult(image, preview);
+      renderResult(image, thumb);
+      console.log('test: done', time.toFixed(3));
+      window.testTime += time;
       console.log('\n');
       if (!window.images_)
         document.title = 'DONE';

ui/file_manager/image_loader/piex/tests.js

@@ -86,29 +86,27 @@ const puppeteer = require('puppeteer');
     "images/UNKNOWN_FORMAT.JPG",
   ];
 
-  let time = 0.0;
+  await page.evaluate(() => {
+    window.testTime = 0;
+  });
 
   for (let i = 0; i < images.length; ++i) {
-    const start = await page.evaluate(() => {
-      return window.performance.now();
-    });
-
     await page.evaluate((image) => {
       window.runTest(image);
     }, images[i]);
 
     await page.mainFrame().waitForFunction('document.title == "DONE"');
 
-    time += await page.evaluate(() => {
-      return window.performance.now();
-    }) - start;
-
     if (program.debug) {
       await sleep(2000);
     }
   }
 
-  console.log('test: done total time', time.toFixed(3));
+  const testTime = await page.evaluate(() => {
+    return window.testTime;
+  });
+
+  console.log('test: done total time', testTime.toFixed(3));
   browser.close();
 
 })();

ui/file_manager/image_loader/piex/tests.sh

@@ -14,8 +14,8 @@ HTTP_SERVER_PID=$!
 
 # Extract preview thumbnails from the raw test images.
 rm -f tests.hash
-node tests.js ${HTTP}/tests.html "$*" | tee -a tests.log | \
-  grep hash > tests.hash
+node tests.js ${HTTP}/tests.html $* | tee -a tests.log | \
+  grep --text hash > tests.hash
 kill ${HTTP_SERVER_PID} > /dev/null 2>&1
 
 # Compare their hash to the golden hash values.