Make tests run from module directory

Before this commit, tests were run with the current working directory
different depending on whether the tests were run from within the
submodule directory (e.g., components) versus in the top level ant
script. This means that relative paths may not be correct if one wants
to run tests only on a specific submodule.

This commit makes it so that the ai.dojunit macro changes directory
into the appropriate submodule before running any tests so that
relative paths do not need to be adjusted based on whether all or some
subset of tests are being run.

Change-Id: I3d3c5803f3c29adc9e371e106aed08d92968eb35

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/backgroundColorTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 /*
  * Author: Edwin (ehzhang@mit.edu)
  */
@@ -8,13 +12,13 @@ var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/backgroundColor/Screen1.scm');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/backgroundColor/Screen1.scm');
 // strip off leading "#|\n$JSON\n" and trailing "|#"
 formJson = formJson.substring(9, formJson.length-2);
 
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/backgroundColor/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/backgroundColor/Screen1.bky');
 
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/backgroundColor/backgroundColorExpected.yail');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/backgroundColor/backgroundColorExpected.yail');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -29,7 +33,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // if success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
   //The evaluate function has arguments passed after the callback
   //in this case we are passing formJson and blocks
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/camcorderTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/camcorder/camcorderExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/camcorder/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/camcorder/camcorderExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/camcorder/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/camcorder/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/camcorder/Screen1.bky');
 var system = require('system');
 var args = system.args;
 // PhantomJS page object to open and load an URL
@@ -22,7 +27,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/clockTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/clock/clockExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/clock/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/clock/clockExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/clock/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/clock/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/clock/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -22,7 +27,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/copyCatTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/copyCat/copyCatExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/copyCat/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/copyCat/copyCatExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/copyCat/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/copyCat/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/copyCat/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -22,7 +27,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/factorialTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/factorial/factorialExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/factorial/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/factorial/factorialExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/factorial/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/factorial/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/factorial/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -23,7 +28,7 @@ page.onError = function (msg, trace) {
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
 debugger;
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/helloPurrTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 /**
  *  * User: Edwin Zhang (ehzhang@mit.edu)
  */
@@ -8,10 +12,10 @@ var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/helloPurr/helloPurrExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/helloPurr/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/helloPurr/helloPurrExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/helloPurr/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2);
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/helloPurr/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/helloPurr/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -26,7 +30,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // if success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
   // The evaluate function has arguments passed after the callback
   // in this case, we are passing in the yail files.
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/makeQuizTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 /**
  *  * User: Edwin Zhang (ehzhang@mit.edu)
  */
@@ -8,10 +12,10 @@ var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/makeQuiz/makeQuizExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/makeQuiz/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/makeQuiz/makeQuizExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/makeQuiz/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2);
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/makeQuiz/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/makeQuiz/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -26,7 +30,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // if success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
   // The evaluate function has arguments passed after the callback
   // in this case, we are passing in the yail files.
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/mathsconvertTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2015-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
@@ -5,10 +10,10 @@ var args = system.args;
 
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/mathsconvert/mathsconvertExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/mathsconvert/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/mathsconvert/mathsconvertExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/mathsconvert/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/mathsconvert/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/mathsconvert/Screen1.bky');
 
 
 // PhantomJS page object to open and load an URL
@@ -25,7 +30,7 @@ page.onError = function (msg, trace) {
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
 debugger;
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/moleMashTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 /**
  *  * User: Edwin Zhang (ehzhang@mit.edu)
  */
@@ -8,10 +12,10 @@ var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/moleMash/MoleMashExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/moleMash/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/moleMash/MoleMashExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/moleMash/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2);
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/moleMash/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/moleMash/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -26,7 +30,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // if success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
   // The evaluate function has arguments passed after the callback
   // in this case, we are passing in the yail files.
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/paintPotTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 /**
  *  * User: Edwin Zhang (ehzhang@mit.edu)
  */
@@ -8,10 +12,10 @@ var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/paintPot/PaintPotExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/paintPot/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/paintPot/PaintPotExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/paintPot/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2);
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/paintPot/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/paintPot/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -27,7 +31,7 @@ page.onError = function (msg, trace) {
 // Open the actual page and load all the JavaScript in it
 // if success is true, all went well
 debugger;
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
   // The evaluate function has arguments passed after the callback
   // in this case, we are passing in the yail files.
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/pictureCycleTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/pictureCycle/pictureCycleExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/pictureCycle/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/pictureCycle/pictureCycleExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/pictureCycle/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/pictureCycle/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/pictureCycle/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -22,7 +27,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/productLookupTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/productLookup/productLookupExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/productLookup/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/productLookup/productLookupExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/productLookup/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/productLookup/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/productLookup/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -22,7 +27,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/sensorTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/sensor/sensorExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/sensor/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/sensor/sensorExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/sensor/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/sensor/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/sensor/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -22,7 +27,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/blocklyeditor/underscoreTest.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+
 var fs = require('fs'); //Always required to read from files
 var path = fs.absolute('.');
 var system = require('system');
 var args = system.args;
 
 //Read files from filesystem
-var expected = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/underscore/underscoreExpected.yail');
-var formJson = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/underscore/Screen1.scm');
+var expected = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/underscore/underscoreExpected.yail');
+var formJson = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/underscore/Screen1.scm');
 formJson = formJson.substring(9, formJson.length-2); // Cut off Leading $JSON
-var blocks = fs.read(path + '/blocklyeditor/tests/com/google/appinventor/blocklyeditor/data/underscore/Screen1.bky');
+var blocks = fs.read(path + '/tests/com/google/appinventor/blocklyeditor/data/underscore/Screen1.bky');
 
 // PhantomJS page object to open and load an URL
 var page = require('webpage').create();
@@ -23,7 +28,7 @@ page.onError = function (msg, trace) {
 // Open the actual page and load all the JavaScript in it
 // If success is true, all went well
 debugger;
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
     // The evaluate function has arguments passed after the callback
     // We are passing in the .bky, .scm, and expected .yail
 

appinventor/blocklyeditor/tests/com/google/appinventor/generators_unit/generator_test_mainRoutine.js

-// Copyright 2011-2013 MIT, All rights reserved
+// Copyright 2011-2017 MIT, All rights reserved
 // Released under the Apache License, Version 2.0
 // http://www.apache.org/licenses/LICENSE-2.0
 
@@ -16,7 +16,7 @@ exports.execute =  function (){
 
   // Open the actual page and load all the JavaScript in it
   // if success is true, all went well
-  page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+  page.open('src/demos/yail/yail_testing_index.html', function(status) {
     if (status !== 'success') {
       console.log('load of yail_testing_index.html unsuccessful');
       phantom.exit();

appinventor/blocklyeditor/tests/com/google/appinventor/generators_unit/generatorsMathTests.js

+// -*- mode: javascript; js-indent-level: 2; -*-
+// Copyright © 2013-2017 Massachusetts Institute of Technology, All rights reserved.
+// Released under the Apache License, Version 2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 /**
  * Author: Jos (josmasflores@gmail.com)
  */
@@ -18,7 +22,7 @@ page.onError = function (msg, trace) {
 
 // Open the actual page and load all the JavaScript in it
 // if success is true, all went well
-page.open('blocklyeditor/src/demos/yail/yail_testing_index.html', function(status) {
+page.open('src/demos/yail/yail_testing_index.html', function(status) {
   //The evaluate function has arguments passed after the callback
   //in this case we are passing the expected value defined earlier
   if (status !== 'success') {

appinventor/build-common.xml

@@ -2,7 +2,14 @@
 
 <!-- ======================================================================
      Copyright 2011 Google Inc.  All Rights Reserved.
+     Copyright 2012-2017 MIT.  All Rights Reserved.
      Author: lizlooney@google.com (Liz Looney)
+     Author: andrew.f.mckinney@gmail.com (Andrew F. McKinney)
+     Author: ewpatton@mit.edu (Evan W. Patton)
+     Author: jis@mit.edu (Jeffrey I. Schiller)
+     Author: ram8647@gmail.com (Ralph Morelli)
+     Author: sharon@google.com (Sharon Perl)
+     Author: trevorbadams@gmail.com (Treavor Adams)
 
      Contains definitions common to multiple App Inventor build.xml files.
      ====================================================================== -->
@@ -194,7 +201,9 @@
            destfile="${local.build.dir}/@{aij-testingtarget}.jar" />
 
       <junit printsummary="yes"
-             fork="yes"
+             fork="true"
+             dir="${basedir}"
+             forkmode="once"
              haltonfailure="no"
              maxmemory="925m"
              showoutput="no">