From e0ca5358537f9cc90b0ca2c89af98cba2eee286a Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 8 Nov 2018 10:08:42 -0800 Subject: [PATCH] CR round 2 --- libraries/script-engine/src/ScriptEngine.cpp | 4 ++-- .../moduleTests/entity/entityConstructorAPIException.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 14e8f45da9..455fd93f4b 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -418,10 +418,10 @@ void ScriptEngine::waitTillDoneRunning() { workerThread->quit(); if (isEvaluating()) { - qCWarning(scriptengine) << "Script Engine has been running too long, aborting."; + qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename(); abortEvaluation(); } else { - qCWarning(scriptengine) << "Script Engine has been running too long, throwing."; + qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename(); auto context = currentContext(); if (context) { context->throwError("Timed out during shutdown"); diff --git a/scripts/developer/tests/unit_tests/moduleTests/entity/entityConstructorAPIException.js b/scripts/developer/tests/unit_tests/moduleTests/entity/entityConstructorAPIException.js index 62b861ae8f..bbe694b578 100644 --- a/scripts/developer/tests/unit_tests/moduleTests/entity/entityConstructorAPIException.js +++ b/scripts/developer/tests/unit_tests/moduleTests/entity/entityConstructorAPIException.js @@ -2,12 +2,12 @@ // test module method exception being thrown within main constructor (function() { var apiMethod = Script.require('../exceptions/exceptionInFunction.js'); - print("apiMethod", apiMethod); + print(Script.resolvePath(''), "apiMethod", apiMethod); // this next line throws from within apiMethod print(apiMethod()); return { preload: function(uuid) { - print("entityConstructorAPIException::preload -- never seen --", uuid); + print("entityConstructorAPIException::preload -- never seen --", uuid, Script.resolvePath('')); }, }; });