aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/shared.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/shared.h')
-rw-r--r--tests/auto/shared.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/shared.h b/tests/auto/shared.h
index f40a7dbfb..8f85f5d6c 100644
--- a/tests/auto/shared.h
+++ b/tests/auto/shared.h
@@ -101,8 +101,9 @@ inline QString relativeBuildDir(const QString &configurationName = QString())
return !configurationName.isEmpty() ? configurationName : QLatin1String("default");
}
-inline QString relativeBuildGraphFilePath() {
- return relativeBuildDir() + QLatin1Char('/') + relativeBuildDir() + QLatin1String(".bg");
+inline QString relativeBuildGraphFilePath(const QString &configName = QString()) {
+ return relativeBuildDir(configName) + QLatin1Char('/') + relativeBuildDir(configName)
+ + QLatin1String(".bg");
}
inline bool regularFileExists(const QString &filePath)
@@ -215,9 +216,10 @@ inline QString relativeProductBuildDir(const QString &productName,
return relativeBuildDir(configurationName) + '/' + dirName;
}
-inline QString relativeExecutableFilePath(const QString &productName)
+inline QString relativeExecutableFilePath(const QString &productName,
+ const QString &configName = QString())
{
- return relativeProductBuildDir(productName) + '/'
+ return relativeProductBuildDir(productName, configName) + '/'
+ qbs::Internal::HostOsInfo::appendExecutableSuffix(productName);
}