diff options
| -rw-r--r-- | tests/runtests.qs | 4 | ||||
| -rw-r--r-- | utils/utils.cpp | 6 | ||||
| -rw-r--r-- | utils/utils.h | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/tests/runtests.qs b/tests/runtests.qs index 9d74e00..f103572 100644 --- a/tests/runtests.qs +++ b/tests/runtests.qs @@ -1,7 +1,9 @@ include("test.js") //-------------------- Main -------------------- -tests = utils.subDirectories(".") +var dir = new QDir(utils.currentScripRoot); +var tests = dir.entryList([], Filter.Dirs | Filter.NoDotAndDotDot); + for (var i = 0; i < tests.length; i++) { runTest(tests[i]) } diff --git a/utils/utils.cpp b/utils/utils.cpp index 26ea3b5..f6adfcd 100644 --- a/utils/utils.cpp +++ b/utils/utils.cpp @@ -39,12 +39,6 @@ Utils::Utils(QObject *parent) : { } -QStringList Utils::subDirectories(const QString &directory) const -{ - QDir dir(ScriptRunner::absolutePath(directory)); - return dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); -} - QStringList Utils::backtrace() const { QStringList result; diff --git a/utils/utils.h b/utils/utils.h index 2c25d2a..517544e 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -44,7 +44,6 @@ public: explicit Utils(QObject *parent = 0); public slots: - QStringList subDirectories(const QString& directory) const; QStringList backtrace() const; public: |