mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-04-07 10:02:24 +02:00
Make sure only top-level recursive script runs recursively.
This commit is contained in:
parent
b2fb7a737b
commit
d3e0aa5d8c
1 changed files with 6 additions and 3 deletions
|
@ -835,8 +835,8 @@ void Test::createRecursiveScript(const QString& directory, bool interactiveMode)
|
|||
<< endl;
|
||||
textStream << "Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE);" << endl << endl;
|
||||
|
||||
textStream << "if (typeof nitpick === 'undefined') var nitpick = createNitpick(Script.resolvePath(\".\"));" << endl;
|
||||
textStream << "if (typeof testsRootPath === 'undefined') var testsRootPath = nitpick.getTestsRootPath();" << endl << endl;
|
||||
textStream << "if (typeof nitpick === 'undefined') nitpick = createNitpick(Script.resolvePath(\".\"));" << endl;
|
||||
textStream << "if (typeof testsRootPath === 'undefined') testsRootPath = nitpick.getTestsRootPath();" << endl << endl;
|
||||
|
||||
textStream << "nitpick.enableRecursive();" << endl;
|
||||
textStream << "nitpick.enableAuto();" << endl << endl;
|
||||
|
@ -847,7 +847,10 @@ void Test::createRecursiveScript(const QString& directory, bool interactiveMode)
|
|||
}
|
||||
|
||||
textStream << endl;
|
||||
textStream << "nitpick.runRecursive();" << endl;
|
||||
textStream << "if (typeof runningRecursive === 'undefined') {" << endl;
|
||||
textStream << " runningRecursive = true;" << endl;
|
||||
textStream << " nitpick.runRecursive();" << endl;
|
||||
textStream << "}" << endl << endl;
|
||||
|
||||
recursiveTestsFile.close();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue