From 7ecbab597fd56a172f93c2e0d7dc97d12a77b101 Mon Sep 17 00:00:00 2001
From: John Vilk <jvilk@cs.umass.edu>
Date: Wed, 7 Feb 2018 16:30:49 -0800
Subject: [PATCH] Fixing TypeScript warnings, upgrade to Travis Trusty.

---
 .travis.yml                                  | 21 ++++++++++----------
 test/tests/fs/OverlayFS/delete-log-test.ts   |  2 ++
 test/tests/fs/all/node-fs-write-file-sync.ts |  6 +++---
 test/tests/general/check-options-test.ts     |  3 ++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8579bdbe4..788461582 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
+dist: trusty
+sudo: false
 language: node_js
 node_js:
-  - "4"
-
-sudo: false
+  - "8"
 
 cache:
   yarn: true
-  directories:
-    - node_modules
 
 before_install:
-  - "node --version"
-  - "npm --version"
-  - "nvm --version"
-  - "firefox --version"
+  - node --version
+  - yarn --version
+  - nvm --version
+  - firefox --version
 
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
+install:
+  - yarn install
+
 script:
-  - "npm test"
+  - yarn test
diff --git a/test/tests/fs/OverlayFS/delete-log-test.ts b/test/tests/fs/OverlayFS/delete-log-test.ts
index 5e0417779..77be5c1f5 100644
--- a/test/tests/fs/OverlayFS/delete-log-test.ts
+++ b/test/tests/fs/OverlayFS/delete-log-test.ts
@@ -8,6 +8,8 @@ const logPath = '/.deletedFiles.log';
 declare var __numWaiting: number;
 
 export default function() {
+  // HACK around TypeScript bug.
+  if (__numWaiting) {}
   var rootFS = (<OverlayFS> fs.getRootFS()).unwrap(),
     fses = rootFS.getOverlayedFileSystems(),
     // XXX: Make these proper API calls.
diff --git a/test/tests/fs/all/node-fs-write-file-sync.ts b/test/tests/fs/all/node-fs-write-file-sync.ts
index 9f009fdb3..ff533988b 100644
--- a/test/tests/fs/all/node-fs-write-file-sync.ts
+++ b/test/tests/fs/all/node-fs-write-file-sync.ts
@@ -4,7 +4,7 @@ import assert from '../../../harness/wrapped-assert';
 import common from '../../../harness/common';
 
 export default function() {
-  var openCount = 0;
+  //var openCount = 0;
   var mode: number;
   var content: string;
   var rootFS = fs.getRootFS();
@@ -22,12 +22,12 @@ export default function() {
   }
 
   function openSync() {
-    openCount++;
+    //openCount++;
     return (<any>rootFS)._openSync.apply(rootFS, arguments);
   }
 
   function closeSync() {
-    openCount--;
+    //openCount--;
     return (<any>fs)._closeSync.apply(fs, arguments);
   }
 
diff --git a/test/tests/general/check-options-test.ts b/test/tests/general/check-options-test.ts
index e3b974baa..89400cb9c 100644
--- a/test/tests/general/check-options-test.ts
+++ b/test/tests/general/check-options-test.ts
@@ -46,7 +46,8 @@ function errorMessageAssert(expectedMsgs: string[], unexpectedMsgs: string[] = [
 }
 
 export default function() {
-
+  // HACK around TypeScript bug.
+  if (__numWaiting) {}
   const emptyOptionsFS = getFileSystem({});
   checkOptions(emptyOptionsFS, {}, noErrorAssert);
   // Tolerates unrecognized options.