ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build,test: fix linux build and tests

Browse Source 
* FilesystemTest fix for linux
* isTrial.h include removed
This commit is contained in:
Andreas Stallinger
2016-10-10 09:23:39 +02:00
parent 0d950d96f5
commit d2e1c62b59
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/platform_includes/includesLinux.h
+1 -9
View File
@@ -8,7 +8,6 @@
#include "utility/file/FilePath.h"
#include "utility/file/FileSystem.h"
#include "qt/utility/utilityQt.h"
#include "isTrial.h"
void setupPlatform(int argc, char *argv[])
{
@@ -22,14 +21,7 @@ void setupApp(int argc, char *argv[])
}
std::string userdir(std::getenv("HOME"));
if(isTrial())
{
userdir.append("/.config/coatitrial/");
}
else
{
userdir.append("/.config/coati/");
}
userdir.append("/.config/coati/");
UserPaths::setUserDataPath(userdir);
src/test/FileSystemTestSuite.h
+28 -5
View File
@@ -85,11 +85,21 @@ public:
std::vector<FileInfo> files = FileSystem::getFileInfosFromPaths(directoryPaths, extensions, true);
TS_ASSERT_EQUALS(files.size(), 5);
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/player.h"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/sample.cpp"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/main.cpp"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/src/test.cpp"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/src/test.h"));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/player.h",
"./data/FileSystemTestSuite/player.h"
));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/sample.cpp",
"./data/FileSystemTestSuite/sample.cpp"
));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/main.cpp",
"./data/FileSystemTestSuite/src/Settings/src/main.cpp"
));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/test.cpp",
"./data/FileSystemTestSuite/src/Settings/src/test.cpp"
));
TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/test.h",
"./data/FileSystemTestSuite/src/Settings/src/test.h"
));
#endif
}
@@ -141,4 +151,17 @@ private:
return false;
}
bool isInFileInfos(const std::vector<FileInfo>& infos, const std::string filename, const std::string filename2)
{
for (const FileInfo& info : infos)
{
if (info.path.str() == filename || info.path.str() == filename2)
{
return true;
}
}
return false;
}
};